Bug 3465 - Remove _adapter members from test where unecessary

28 files changed, 60 insertions, 104 deletions

diff --git a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
index 4610a913724..7691acdcdfb 100644
--- a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java
@@ -12,9 +12,8 @@ import test.Freeze.evictor.Test.*;
 
 public final class RemoteEvictorFactoryI extends _RemoteEvictorFactoryDisp
 {
-    RemoteEvictorFactoryI(Ice.ObjectAdapter adapter, String envName)
+    RemoteEvictorFactoryI(String envName)
     {
-        _adapter = adapter;
         _envName = envName;
     }
 
@@ -22,17 +21,17 @@ public final class RemoteEvictorFactoryI extends _RemoteEvictorFactoryDisp
     public RemoteEvictorPrx
     createEvictor(String name, boolean transactional, Ice.Current current)
     {
-        RemoteEvictorI remoteEvictor = new RemoteEvictorI(_adapter, _envName, name, transactional);
+        RemoteEvictorI remoteEvictor = 
+            new RemoteEvictorI(current.adapter.getCommunicator(), _envName, name, transactional);
         return RemoteEvictorPrxHelper.
-            uncheckedCast(_adapter.add(remoteEvictor, _adapter.getCommunicator().stringToIdentity(name)));
+            uncheckedCast(current.adapter.add(remoteEvictor, current.adapter.getCommunicator().stringToIdentity(name)));
     }
 
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
-    private Ice.ObjectAdapter _adapter;
     private String _envName;
 }
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java
index d1c5b28f60d..4e026509ff1 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorI.java
@@ -45,9 +45,8 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
     }
 
 
-    RemoteEvictorI(Ice.ObjectAdapter adapter, String envName, String category, boolean transactional)
+    RemoteEvictorI(Ice.Communicator communicator, String envName, String category, boolean transactional)
     {
-        _adapter = adapter;
         _envName = envName;
         _category = category;
 
@@ -55,7 +54,7 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
         // NOTE: COMPILERBUG: The timeout here is required for MacOS X. It shouldn't be too low since
         // some operations can take some time to complete on slow machines.
         //
-        _evictorAdapter = _adapter.getCommunicator().
+        _evictorAdapter = communicator.
             createObjectAdapterWithEndpoints(java.util.UUID.randomUUID().toString(), "default -t 60000");
 
         Initializer initializer = new Initializer();
@@ -140,7 +139,7 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
     deactivate(Ice.Current current)
     {
         _evictorAdapter.destroy();
-        _adapter.remove(_adapter.getCommunicator().stringToIdentity(_category));
+        current.adapter.remove(current.adapter.getCommunicator().stringToIdentity(_category));
     }
     
     public void
@@ -165,8 +164,6 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
         return _envName;
     }    
 
-
-    private Ice.ObjectAdapter _adapter;
     private final String _envName;
     private String _category;
     private Freeze.Evictor _evictor;
diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java
index f2f94b49a56..c67f17354f8 100644
--- a/java/test/Freeze/evictor/Server.java
+++ b/java/test/Freeze/evictor/Server.java
@@ -72,7 +72,7 @@ public class Server extends test.Util.Application
         communicator.addObjectFactory(new ServantFactory(), "::Test::Servant");
         communicator.addObjectFactory(new FacetFactory(), "::Test::Facet");
 
-        RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI(adapter, "db");
+        RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI("db");
         adapter.add(factory, communicator.stringToIdentity("factory"));
     
         adapter.activate();
diff --git a/java/test/Freeze/oldevictor/RemoteEvictorFactoryI.java b/java/test/Freeze/oldevictor/RemoteEvictorFactoryI.java
index fdbaee5b81a..0e99ab62388 100644
--- a/java/test/Freeze/oldevictor/RemoteEvictorFactoryI.java
+++ b/java/test/Freeze/oldevictor/RemoteEvictorFactoryI.java
@@ -12,9 +12,8 @@ import test.Freeze.oldevictor.Test.*;
 
 public final class RemoteEvictorFactoryI extends _RemoteEvictorFactoryDisp
 {
-    RemoteEvictorFactoryI(Ice.ObjectAdapter adapter, String envName)
+    RemoteEvictorFactoryI(String envName)
     {
-        _adapter = adapter;
         _envName = envName;
     }
 
@@ -22,17 +21,16 @@ public final class RemoteEvictorFactoryI extends _RemoteEvictorFactoryDisp
     public RemoteEvictorPrx
     createEvictor(String name, Ice.Current current)
     {
-        RemoteEvictorI remoteEvictor = new RemoteEvictorI(_adapter, _envName, name);
+        RemoteEvictorI remoteEvictor = new RemoteEvictorI(current.adapter.getCommunicator(), _envName, name);
         return RemoteEvictorPrxHelper.
-            uncheckedCast(_adapter.add(remoteEvictor, _adapter.getCommunicator().stringToIdentity(name)));
+            uncheckedCast(current.adapter.add(remoteEvictor, current.adapter.getCommunicator().stringToIdentity(name)));
     }
 
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
-    private Ice.ObjectAdapter _adapter;
     private String _envName;
 }
diff --git a/java/test/Freeze/oldevictor/RemoteEvictorI.java b/java/test/Freeze/oldevictor/RemoteEvictorI.java
index e620627130b..24301705ee0 100644
--- a/java/test/Freeze/oldevictor/RemoteEvictorI.java
+++ b/java/test/Freeze/oldevictor/RemoteEvictorI.java
@@ -40,16 +40,15 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
     }
 
 
-    RemoteEvictorI(Ice.ObjectAdapter adapter, String envName, String category)
+    RemoteEvictorI(Ice.Communicator communicator, String envName, String category)
     {
-        _adapter = adapter;
         _category = category;
 
         //
         // NOTE: COMPILERBUG: The timeout here is required for MacOS X.
         //
-        _evictorAdapter = _adapter.getCommunicator().
-            createObjectAdapterWithEndpoints(java.util.UUID.randomUUID().toString(), "default -t 30000");
+        _evictorAdapter = communicator.createObjectAdapterWithEndpoints(
+                                java.util.UUID.randomUUID().toString(), "default -t 30000");
 
         Initializer initializer = new Initializer();
 
@@ -117,7 +116,7 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
     deactivate(Ice.Current current)
     {
         _evictorAdapter.destroy();
-        _adapter.remove(_adapter.getCommunicator().stringToIdentity(_category));
+        current.adapter.remove(current.adapter.getCommunicator().stringToIdentity(_category));
     }
     
     public void
@@ -136,7 +135,6 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
         }
     }
 
-    private Ice.ObjectAdapter _adapter;
     private String _category;
     private Freeze.BackgroundSaveEvictor _evictor;
     private Ice.ObjectAdapter _evictorAdapter;
diff --git a/java/test/Freeze/oldevictor/Server.java b/java/test/Freeze/oldevictor/Server.java
index 779d71c79db..da652fdac82 100644
--- a/java/test/Freeze/oldevictor/Server.java
+++ b/java/test/Freeze/oldevictor/Server.java
@@ -52,7 +52,7 @@ public class Server extends test.Util.Application
         Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("Evictor");
     
-        RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI(adapter, "db");
+        RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI("db");
         adapter.add(factory, communicator.stringToIdentity("factory"));
     
         Ice.ObjectFactory servantFactory = new ServantFactory();
diff --git a/java/test/Ice/checksum/ChecksumI.java b/java/test/Ice/checksum/ChecksumI.java
index 8d68ddf8404..7547130cf76 100644
--- a/java/test/Ice/checksum/ChecksumI.java
+++ b/java/test/Ice/checksum/ChecksumI.java
@@ -14,22 +14,19 @@ import test.Ice.checksum.server.Test.*;
 public final class ChecksumI extends _ChecksumDisp
 {
     public
-    ChecksumI(Ice.ObjectAdapter adapter)
+    ChecksumI()
     {
-        _adapter = adapter;
     }
 
     public java.util.Map<String, String>
-    getSliceChecksums(Ice.Current __current)
+    getSliceChecksums(Ice.Current current)
     {
         return SliceChecksums.checksums;
     }
 
     public void
-    shutdown(Ice.Current __current)
+    shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
-
-    private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/test/Ice/checksum/Server.java b/java/test/Ice/checksum/Server.java
index 426165083cb..550ba0f70aa 100644
--- a/java/test/Ice/checksum/Server.java
+++ b/java/test/Ice/checksum/Server.java
@@ -17,7 +17,7 @@ public class Server extends test.Util.Application
 	Ice.Communicator communicator = communicator();
         communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new ChecksumI(adapter);
+        Ice.Object object = new ChecksumI();
         adapter.add(object, communicator.stringToIdentity("test"));
         adapter.activate();
         return WAIT;
diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/Ice/exceptions/AMDServer.java
index b5338f26dd2..dd4441f50dd 100644
--- a/java/test/Ice/exceptions/AMDServer.java
+++ b/java/test/Ice/exceptions/AMDServer.java
@@ -15,7 +15,7 @@ public class AMDServer extends test.Util.Application
     {
         Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new AMDThrowerI(adapter);
+        Ice.Object object = new AMDThrowerI();
         adapter.add(object, communicator.stringToIdentity("thrower"));
         adapter.activate();
         return WAIT;
diff --git a/java/test/Ice/exceptions/AMDThrowerI.java b/java/test/Ice/exceptions/AMDThrowerI.java
index b4b187a5ab1..d37b25971a1 100644
--- a/java/test/Ice/exceptions/AMDThrowerI.java
+++ b/java/test/Ice/exceptions/AMDThrowerI.java
@@ -34,15 +34,14 @@ import test.Ice.exceptions.AMD.Test._ThrowerDisp;
 public final class AMDThrowerI extends _ThrowerDisp
 {
     public
-    AMDThrowerI(Ice.ObjectAdapter adapter)
+    AMDThrowerI()
     {
-        _adapter = adapter;
     }
 
     public void
     shutdown_async(AMD_Thrower_shutdown cb, Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
         cb.ice_response();
     }
 
@@ -185,6 +184,4 @@ public final class AMDThrowerI extends _ThrowerDisp
     {
         throw new java.lang.AssertionError();
     }
-
-    private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index cbcf32ded12..b217e732468 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -16,7 +16,7 @@ public class Collocated extends test.Util.Application
     {
     	Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new ThrowerI(adapter);
+        Ice.Object object = new ThrowerI();
         adapter.add(object, communicator.stringToIdentity("thrower"));
 
         AllTests.allTests(communicator, true, getWriter());
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index e56792ec055..a91320212bc 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -15,7 +15,7 @@ public class Server extends test.Util.Application
     {
         Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new ThrowerI(adapter);
+        Ice.Object object = new ThrowerI();
         adapter.add(object, communicator.stringToIdentity("thrower"));
         adapter.activate();
         return WAIT;
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java
index a2a94ab389c..371b099f86e 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/Ice/exceptions/ThrowerI.java
@@ -18,15 +18,14 @@ import test.Ice.exceptions.Test._ThrowerDisp;
 public final class ThrowerI extends _ThrowerDisp
 {
     public
-    ThrowerI(Ice.ObjectAdapter adapter)
+    ThrowerI()
     {
-        _adapter = adapter;
     }
 
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
     public boolean
@@ -149,6 +148,4 @@ public final class ThrowerI extends _ThrowerDisp
     {
         throw new java.lang.AssertionError();
     }
-
-    private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index e5d0e935be5..1eff6bd09b0 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -63,7 +63,7 @@ public class Server extends test.Util.Application
         // Don't move this, it needs the port.
         communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI(adapter, port);
+        Ice.Object object = new TestI(port);
         adapter.add(object, communicator.stringToIdentity("test"));
         adapter.activate();
         return WAIT;
diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java
index 576ab2a8c08..6a60d0942c5 100644
--- a/java/test/Ice/faultTolerance/TestI.java
+++ b/java/test/Ice/faultTolerance/TestI.java
@@ -14,16 +14,15 @@ import test.Ice.faultTolerance.Test._TestIntfDisp;
 public final class TestI extends _TestIntfDisp
 {
     public
-    TestI(Ice.ObjectAdapter adapter, int port)
+    TestI(int port)
     {
-        _adapter = adapter;
         _pseudoPid = port; // We use the port number instead of the process ID in Java.
     }
 
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
     public void
@@ -45,5 +44,4 @@ public final class TestI extends _TestIntfDisp
     }
 
     private int _pseudoPid;
-    private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java
index b9ca6d9cd37..dd7c618dc19 100644
--- a/java/test/Ice/inheritance/InitialI.java
+++ b/java/test/Ice/inheritance/InitialI.java
@@ -32,23 +32,14 @@ public final class InitialI extends _InitialDisp
     public
     InitialI(Ice.ObjectAdapter adapter)
     {
-        _adapter = adapter;
-        _ca = CAPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new CAI()));
-        _cb = CBPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new CBI()));
-        _cc = CCPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new CCI()));
-        _cd = CDPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new CDI()));
-        _ia = IAPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new IAI()));
-        _ib1 = IB1PrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new IB1I()));
-        _ib2 = IB2PrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new IB2I()));
-        _ic = ICPrxHelper.uncheckedCast(
-            _adapter.addWithUUID(new ICI()));
+        _ca = CAPrxHelper.uncheckedCast(adapter.addWithUUID(new CAI()));
+        _cb = CBPrxHelper.uncheckedCast(adapter.addWithUUID(new CBI()));
+        _cc = CCPrxHelper.uncheckedCast(adapter.addWithUUID(new CCI()));
+        _cd = CDPrxHelper.uncheckedCast(adapter.addWithUUID(new CDI()));
+        _ia = IAPrxHelper.uncheckedCast(adapter.addWithUUID(new IAI()));
+        _ib1 = IB1PrxHelper.uncheckedCast(adapter.addWithUUID(new IB1I()));
+        _ib2 = IB2PrxHelper.uncheckedCast(adapter.addWithUUID(new IB2I()));
+        _ic = ICPrxHelper.uncheckedCast(adapter.addWithUUID(new ICI()));
     }
 
     public CAPrx
@@ -102,10 +93,9 @@ public final class InitialI extends _InitialDisp
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
-    private Ice.ObjectAdapter _adapter;
     private CAPrx _ca;
     private CBPrx _cb;
     private CCPrx _cc;
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index 97ab0d0c385..72fb636c6aa 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -31,7 +31,7 @@ public class Server extends test.Util.Application
         //
         ServerLocatorRegistry registry = new ServerLocatorRegistry();
         registry.addObject(adapter.createProxy(communicator.stringToIdentity("ServerManager")));
-        Ice.Object object = new ServerManagerI(adapter, registry, _initData, this);
+        Ice.Object object = new ServerManagerI(registry, _initData, this);
         adapter.add(object, communicator.stringToIdentity("ServerManager"));
 
         Ice.LocatorRegistryPrx registryPrx = Ice.LocatorRegistryPrxHelper.uncheckedCast(adapter.add(registry,
diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java
index a445bc8fcd1..9d49832835a 100644
--- a/java/test/Ice/location/ServerManagerI.java
+++ b/java/test/Ice/location/ServerManagerI.java
@@ -15,9 +15,8 @@ import test.Ice.location.Test._ServerManagerDisp;
 
 public class ServerManagerI extends _ServerManagerDisp
 {
-    ServerManagerI(Ice.ObjectAdapter adapter, ServerLocatorRegistry registry, Ice.InitializationData initData, test.Util.Application app)
+    ServerManagerI(ServerLocatorRegistry registry, Ice.InitializationData initData, test.Util.Application app)
     {
-        _adapter = adapter;
         _registry = registry;
         _communicators = new java.util.ArrayList<Ice.Communicator>();
         
@@ -83,10 +82,9 @@ public class ServerManagerI extends _ServerManagerDisp
         {
             i.next().destroy();
         }
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
-    private Ice.ObjectAdapter _adapter;
     private ServerLocatorRegistry _registry;
     private java.util.List<Ice.Communicator> _communicators;
     private Ice.InitializationData _initData;
diff --git a/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/Ice/slicing/exceptions/AMDServer.java
index c8f7592f9ee..0e598cd6e1c 100644
--- a/java/test/Ice/slicing/exceptions/AMDServer.java
+++ b/java/test/Ice/slicing/exceptions/AMDServer.java
@@ -14,7 +14,7 @@ public class AMDServer extends test.Util.Application
     public int run(String[] args)
     {
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object object = new AMDTestI(adapter);
+        Ice.Object object = new AMDTestI();
         adapter.add(object, communicator().stringToIdentity("Test"));
         adapter.activate();
         return WAIT;
diff --git a/java/test/Ice/slicing/exceptions/AMDTestI.java b/java/test/Ice/slicing/exceptions/AMDTestI.java
index 7050650994b..2b1841a0f3c 100644
--- a/java/test/Ice/slicing/exceptions/AMDTestI.java
+++ b/java/test/Ice/slicing/exceptions/AMDTestI.java
@@ -36,15 +36,14 @@ import test.Ice.slicing.exceptions.serverAMD.Test._TestIntfDisp;
 public final class AMDTestI extends _TestIntfDisp
 {
     public
-    AMDTestI(Ice.ObjectAdapter adapter)
+    AMDTestI()
     {
-        _adapter = adapter;
     }
 
     public void
     shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
         cb.ice_response();
     }
 
@@ -186,5 +185,4 @@ public final class AMDTestI extends _TestIntfDisp
         umd2.umd2 = "UnknownMostDerived2.umd2";
         cb.ice_exception(umd2);
     }
-    private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/test/Ice/slicing/exceptions/Server.java b/java/test/Ice/slicing/exceptions/Server.java
index cb4fbce8fba..812c3e0d870 100644
--- a/java/test/Ice/slicing/exceptions/Server.java
+++ b/java/test/Ice/slicing/exceptions/Server.java
@@ -15,7 +15,7 @@ public class Server extends test.Util.Application
     public int run(String[] args)
     {
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI(adapter);
+        Ice.Object object = new TestI();
         adapter.add(object, Ice.Util.stringToIdentity("Test"));
         adapter.activate();
         return WAIT;
diff --git a/java/test/Ice/slicing/exceptions/TestI.java b/java/test/Ice/slicing/exceptions/TestI.java
index cd26ea02403..a5898d78b26 100644
--- a/java/test/Ice/slicing/exceptions/TestI.java
+++ b/java/test/Ice/slicing/exceptions/TestI.java
@@ -22,15 +22,14 @@ import test.Ice.slicing.exceptions.server.Test._TestIntfDisp;
 public final class TestI extends _TestIntfDisp
 {
     public
-    TestI(Ice.ObjectAdapter adapter)
+    TestI()
     {
-        _adapter = adapter;
     }
 
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
     public void
@@ -167,5 +166,4 @@ public final class TestI extends _TestIntfDisp
         umd2.umd2 = "UnknownMostDerived2.umd2";
         throw umd2;
     }
-    private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/test/Ice/slicing/objects/AMDServer.java b/java/test/Ice/slicing/objects/AMDServer.java
index 90820d2fd7b..a012d08cbb1 100644
--- a/java/test/Ice/slicing/objects/AMDServer.java
+++ b/java/test/Ice/slicing/objects/AMDServer.java
@@ -15,7 +15,7 @@ public class AMDServer extends test.Util.Application
     {
         Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new AMDTestI(adapter);
+        Ice.Object object = new AMDTestI();
         adapter.add(object, communicator.stringToIdentity("Test"));
         return WAIT;
     }
diff --git a/java/test/Ice/slicing/objects/AMDTestI.java b/java/test/Ice/slicing/objects/AMDTestI.java
index b339f57eb0a..cdfbdba5f7d 100644
--- a/java/test/Ice/slicing/objects/AMDTestI.java
+++ b/java/test/Ice/slicing/objects/AMDTestI.java
@@ -56,15 +56,14 @@ import test.Ice.slicing.objects.serverAMD.Test._TestIntfDisp;
 public final class AMDTestI extends _TestIntfDisp
 {
     public
-    AMDTestI(Ice.ObjectAdapter adapter)
+    AMDTestI()
     {
-        _adapter = adapter;
     }
 
     public void
     shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
         cb.ice_response();
     }
 
@@ -415,6 +414,4 @@ public final class AMDTestI extends _TestIntfDisp
         f.h.f = f;
         cb.ice_response(f);
     }
-
-    private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/test/Ice/slicing/objects/Server.java b/java/test/Ice/slicing/objects/Server.java
index 03531fd03d2..dbc6e7202ba 100644
--- a/java/test/Ice/slicing/objects/Server.java
+++ b/java/test/Ice/slicing/objects/Server.java
@@ -15,7 +15,7 @@ public class Server extends test.Util.Application
     {
         Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI(adapter);
+        Ice.Object object = new TestI();
         adapter.add(object, Ice.Util.stringToIdentity("Test"));
         adapter.activate();
         return WAIT;
diff --git a/java/test/Ice/slicing/objects/TestI.java b/java/test/Ice/slicing/objects/TestI.java
index d7f53bf5f15..3e8ea1d3fa1 100644
--- a/java/test/Ice/slicing/objects/TestI.java
+++ b/java/test/Ice/slicing/objects/TestI.java
@@ -33,15 +33,14 @@ import test.Ice.slicing.objects.server.Test._TestIntfDisp;
 public final class TestI extends _TestIntfDisp
 {
     public
-    TestI(Ice.ObjectAdapter adapter)
+    TestI()
     {
-        _adapter = adapter;
     }
 
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
     public Ice.Object
@@ -368,6 +367,4 @@ public final class TestI extends _TestIntfDisp
         f.value.h = new Hidden();
         f.value.h.f = f.value;
     }
-
-    private Ice.ObjectAdapter _adapter;
 }
diff --git a/java/test/IceGrid/simple/Server.java b/java/test/IceGrid/simple/Server.java
index 12ab71e1c70..fd0c967e0a5 100644
--- a/java/test/IceGrid/simple/Server.java
+++ b/java/test/IceGrid/simple/Server.java
@@ -18,7 +18,7 @@ public class Server extends test.Util.Application
         argsH.value = communicator().getProperties().parseCommandLineOptions("TestAdapter", argsH.value);
 
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI(adapter);
+        Ice.Object object = new TestI();
         adapter.add(object, communicator().stringToIdentity("test"));
         //shutdownOnInterrupt();
         try
diff --git a/java/test/IceGrid/simple/TestI.java b/java/test/IceGrid/simple/TestI.java
index 7f673eec367..c964d74199d 100644
--- a/java/test/IceGrid/simple/TestI.java
+++ b/java/test/IceGrid/simple/TestI.java
@@ -14,16 +14,13 @@ import test.IceGrid.simple.Test._TestIntfDisp;
 public class TestI extends _TestIntfDisp
 {
     public
-    TestI(Ice.ObjectAdapter adapter)
+    TestI()
     {
-        _adapter = adapter;
     }
 
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
-
-    private Ice.ObjectAdapter _adapter;
 }