diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 12 | ||||
| -rw-r--r-- | java/src/IceInternal/ReferenceFactory.java | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index 1ba89f7c060..b2c843c53a4 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -41,7 +41,7 @@ public class ObjectPrxHelperBase implements ObjectPrx public final boolean ice_isA(String __id) { - return ice_isA(__id, null); + return ice_isA(__id, _reference.getContext()); } public final boolean @@ -70,7 +70,7 @@ public class ObjectPrxHelperBase implements ObjectPrx public final void ice_ping() { - ice_ping(null); + ice_ping(_reference.getContext()); } public final void @@ -100,7 +100,7 @@ public class ObjectPrxHelperBase implements ObjectPrx public String[] ice_ids() { - return ice_ids(null); + return ice_ids(_reference.getContext()); } public String[] @@ -129,7 +129,7 @@ public class ObjectPrxHelperBase implements ObjectPrx public String ice_id() { - return ice_id(null); + return ice_id(_reference.getContext()); } public String @@ -158,7 +158,7 @@ public class ObjectPrxHelperBase implements ObjectPrx public final boolean ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams) { - return ice_invoke(operation, mode, inParams, outParams, null); + return ice_invoke(operation, mode, inParams, outParams, _reference.getContext()); } public final boolean @@ -194,7 +194,7 @@ public class ObjectPrxHelperBase implements ObjectPrx public final void ice_invoke_async(AMI_Object_ice_invoke cb, String operation, OperationMode mode, byte[] inParams) { - ice_invoke_async(cb, operation, mode, inParams, null); + ice_invoke_async(cb, operation, mode, inParams, _reference.getContext()); } public final void diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java index c9eb407239f..c32b5c013bf 100644 --- a/java/src/IceInternal/ReferenceFactory.java +++ b/java/src/IceInternal/ReferenceFactory.java @@ -388,7 +388,7 @@ public final class ReferenceFactory if(beg == -1) { - return create(ident, new java.util.HashMap(), facet, mode, secure, "", routerInfo, locatorInfo, + return create(ident, _instance.getDefaultContext(), facet, mode, secure, "", routerInfo, locatorInfo, _instance.defaultsAndOverrides().defaultCollocationOptimization); } @@ -440,7 +440,7 @@ public final class ReferenceFactory EndpointI[] endp = new EndpointI[endpoints.size()]; endpoints.toArray(endp); - return create(ident, new java.util.HashMap(), facet, mode, secure, endp, routerInfo, + return create(ident, _instance.getDefaultContext(), facet, mode, secure, endp, routerInfo, _instance.defaultsAndOverrides().defaultCollocationOptimization); } else if(s.charAt(beg) == '@') @@ -481,7 +481,7 @@ public final class ReferenceFactory throw e; } adapter = token.value; - return create(ident, new java.util.HashMap(), facet, mode, secure, adapter, routerInfo, locatorInfo, + return create(ident, _instance.getDefaultContext(), facet, mode, secure, adapter, routerInfo, locatorInfo, _instance.defaultsAndOverrides().defaultCollocationOptimization); } @@ -543,14 +543,14 @@ public final class ReferenceFactory { endpoints[i] = _instance.endpointFactoryManager().read(s); } - return create(ident, new java.util.HashMap(), facet, mode, secure, endpoints, routerInfo, + return create(ident, _instance.getDefaultContext(), facet, mode, secure, endpoints, routerInfo, _instance.defaultsAndOverrides().defaultCollocationOptimization); } else { endpoints = new EndpointI[0]; adapterId = s.readString(); - return create(ident, new java.util.HashMap(), facet, mode, secure, + return create(ident, _instance.getDefaultContext(), facet, mode, secure, adapterId, routerInfo, locatorInfo, _instance.defaultsAndOverrides().defaultCollocationOptimization); } |