diff options
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index 36e35165dca..d87dbd9913f 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -220,7 +220,7 @@ public class ObjectPrxHelperBase implements ObjectPrx public final ObjectPrx ice_newContext(java.util.Map newContext) { - if(_reference.hasContext() && newContext.equals(_reference.getContext())) + if(_reference.hasContext() && newContext != null && newContext.equals(_reference.getContext())) { return this; } |