summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/CHANGES7
-rw-r--r--java/src/Ice/ConnectionI.java2
-rw-r--r--java/src/Ice/ObjectAdapterI.java2
3 files changed, 9 insertions, 2 deletions
diff --git a/java/CHANGES b/java/CHANGES
index 668899bf91f..57c8a20a256 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -1,3 +1,10 @@
+Changes since version 3.0.1
+---------------------------
+
+- createReverseProxy() and createProxy() did not use the default context
+ established on the communicator and created a proxy with an empty context
+ instead. This has been fixed.
+
Changes since version 3.0.0
---------------------------
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java
index 33c2c6ce256..d478eba4750 100644
--- a/java/src/Ice/ConnectionI.java
+++ b/java/src/Ice/ConnectionI.java
@@ -1039,7 +1039,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
//
ConnectionI[] connections = new ConnectionI[1];
connections[0] = this;
- IceInternal.Reference ref = _instance.referenceFactory().create(ident, new java.util.HashMap(), "",
+ IceInternal.Reference ref = _instance.referenceFactory().create(ident, _instance.getDefaultContext(), "",
IceInternal.Reference.ModeTwoway, connections);
return _instance.proxyFactory().referenceToProxy(ref);
}
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index c74d8711efc..4b74c19d520 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -511,7 +511,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
IceInternal.EndpointI[] endpoints = new IceInternal.EndpointI[0];
ConnectionI[] arr = new ConnectionI[connections.size()];
connections.toArray(arr);
- IceInternal.Reference ref = _instance.referenceFactory().create(ident, new java.util.HashMap(), "",
+ IceInternal.Reference ref = _instance.referenceFactory().create(ident, _instance.getDefaultContext(), "",
IceInternal.Reference.ModeTwoway, arr);
return _instance.proxyFactory().referenceToProxy(ref);
}