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;