summaryrefslogtreecommitdiff
path: root/java/src/Ice/ObjectPrxHelperBase.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2007-05-02 14:51:18 +0000
committerBenoit Foucher <benoit@zeroc.com>2007-05-02 14:51:18 +0000
commit788df051b121e7fa096fa47e1832891e5aab2e24 (patch)
treea1683bb830a54358e260c5b75e1536896ae513cc /java/src/Ice/ObjectPrxHelperBase.java
parentAdded ice_getAdapterId/ice_adapterId proxy methods (diff)
downloadice-788df051b121e7fa096fa47e1832891e5aab2e24.tar.bz2
ice-788df051b121e7fa096fa47e1832891e5aab2e24.tar.xz
ice-788df051b121e7fa096fa47e1832891e5aab2e24.zip
Fixed potential NPE
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
-rw-r--r--java/src/Ice/ObjectPrxHelperBase.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 3884ebee0bd..3bcc8527cb3 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -399,6 +399,11 @@ public class ObjectPrxHelperBase implements ObjectPrx
public final ObjectPrx
ice_adapterId(String newAdapterId)
{
+ if(newAdapterId == null)
+ {
+ newAdapterId = "";
+ }
+
if(newAdapterId.equals(_reference.getAdapterId()))
{
return this;