2 files changed, 2 insertions, 9 deletions
diff --git a/java/demo/Ice/callback/CallbackI.java b/java/demo/Ice/callback/CallbackI.java
index 67a8b295cbe..11c28e084c7 100644
--- a/java/demo/Ice/callback/CallbackI.java
+++ b/java/demo/Ice/callback/CallbackI.java
@@ -14,11 +14,6 @@
 
 public final class CallbackI extends Callback
 {
-    CallbackI(Ice.Communicator communicator)
-    {
-        _communicator = communicator;
-    }
-
     public void
     initiateCallback(CallbackReceiverPrx proxy, Ice.Current current)
     {
@@ -30,8 +25,6 @@ public final class CallbackI extends Callback
     shutdown(Ice.Current current)
     {
         System.out.println("Shutting down...");
-        _communicator.shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
-
-    private Ice.Communicator _communicator;
 }
diff --git a/java/demo/Ice/callback/CallbackServer.java b/java/demo/Ice/callback/CallbackServer.java
index 82c56532fdd..591d586d602 100644
--- a/java/demo/Ice/callback/CallbackServer.java
+++ b/java/demo/Ice/callback/CallbackServer.java
@@ -19,7 +19,7 @@ class CallbackServer extends Ice.Application
     {
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Callback.Server");
         CallbackPrx self = CallbackPrxHelper.uncheckedCast(adapter.createProxy(Ice.Util.stringToIdentity("callback")));
-        adapter.add(new CallbackI(communicator()), Ice.Util.stringToIdentity("callback"));
+        adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback"));
         adapter.activate();
         communicator().waitForShutdown();
         return 0;