diff options
author | Mark Spruiell <mes@zeroc.com> | 2005-02-08 20:17:26 +0000 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2005-02-08 20:17:26 +0000 |
commit | 6b669e5ba099f8ae780faae2a4865fc611f178a9 (patch) | |
tree | a34ba4e9bcf23352147a8b95fc8d67ec6a08d65a /java/src/Ice/ObjectPrxHelperBase.java | |
parent | changing sequence unmarshaling for fixed-length types (diff) | |
download | ice-6b669e5ba099f8ae780faae2a4865fc611f178a9.tar.bz2 ice-6b669e5ba099f8ae780faae2a4865fc611f178a9.tar.xz ice-6b669e5ba099f8ae780faae2a4865fc611f178a9.zip |
Reference fixes:
- Moving _secure to RoutableReference
- Fixing changeDefault()
- Fixing changeRouter() and changeLocator() to return appropriate values
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; } |