3 files changed, 18 insertions, 3 deletions
diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index a2a81d4c5af..8785f1bb44c 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -61,7 +61,7 @@ public class Client extends Ice.Application
         setInterruptHook(new ShutdownHook());
 
         CallbackSenderPrx twoway = CallbackSenderPrxHelper.checkedCast(
-            communicator().propertyToProxy("Callback.CallbackServer").
+            communicator().propertyToProxy("CallbackSender.Proxy").
                 ice_twoway().ice_timeout(-1).ice_secure(false));
         if(twoway == null)
         {
diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client
index b53d5737c4b..242366bb84f 100644
--- a/java/demo/Ice/callback/config.client
+++ b/java/demo/Ice/callback/config.client
@@ -1,4 +1,14 @@
-Callback.CallbackServer=callback:tcp -p 12000:udp -p 10000:ssl -p 10001
+#
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+
+#
+# The client creates one single object adapter with the name
+# "Callback.Client". The following line sets the endpoints for this
+# adapter.
+#
 Callback.Client.Endpoints=tcp:udp:ssl
 
 #
diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server
index c1b58bd8e45..72ea2cf0425 100644
--- a/java/demo/Ice/callback/config.server
+++ b/java/demo/Ice/callback/config.server
@@ -1,4 +1,9 @@
-Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001
+#
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
+#
+Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions