diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-09-08 07:26:18 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-09-08 07:26:18 +0000 |
| commit | 5b9b0d512c8d0ccc4c0e480b802fa841f38fd55c (patch) | |
| tree | da30228a4ed4468ee10db027590ba9a10a3e4e5d /java/src/Ice/ObjectPrxHelperBase.java | |
| parent | fix build problem. (diff) | |
| download | ice-5b9b0d512c8d0ccc4c0e480b802fa841f38fd55c.tar.bz2 ice-5b9b0d512c8d0ccc4c0e480b802fa841f38fd55c.tar.xz ice-5b9b0d512c8d0ccc4c0e480b802fa841f38fd55c.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=460
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index 5f324bd307f..96d0687cbb0 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -235,31 +235,17 @@ public class ObjectPrxHelperBase implements ObjectPrx public final ObjectPrx ice_newContext(java.util.Map newContext) { - if(_reference.hasContext() && newContext != null && newContext.equals(_reference.getContext())) - { - return this; - } - else - { - ObjectPrxHelperBase proxy = new ObjectPrxHelperBase(); - proxy.setup(_reference.changeContext(newContext)); - return proxy; - } + ObjectPrxHelperBase proxy = new ObjectPrxHelperBase(); + proxy.setup(_reference.changeContext(newContext)); + return proxy; } public final ObjectPrx ice_defaultContext() { - if(!_reference.hasContext()) - { - return this; - } - else - { - ObjectPrxHelperBase proxy = new ObjectPrxHelperBase(); - proxy.setup(_reference.defaultContext()); - return proxy; - } + ObjectPrxHelperBase proxy = new ObjectPrxHelperBase(); + proxy.setup(_reference.defaultContext()); + return proxy; } public final String |