4 files changed, 6 insertions, 6 deletions
diff --git a/java/test/Freeze/complex/Complex/ObjectFactoryI.java b/java/test/Freeze/complex/Complex/ObjectFactoryI.java
index fc85b556168..515729a3b2e 100644
--- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java
+++ b/java/test/Freeze/complex/Complex/ObjectFactoryI.java
@@ -10,7 +10,7 @@
 
 package Complex;
 
-public class ObjectFactoryI implements Ice.ObjectFactory
+public class ObjectFactoryI extends Ice.LocalObjectImpl implements Ice.ObjectFactory
 {
     public Ice.Object
     create(String type)
diff --git a/java/test/IcePack/deployer/FreezeService.java b/java/test/IcePack/deployer/FreezeService.java
index 73e9ddff925..e4f49542786 100644
--- a/java/test/IcePack/deployer/FreezeService.java
+++ b/java/test/IcePack/deployer/FreezeService.java
@@ -8,7 +8,7 @@
 //
 // **********************************************************************
 
-public class FreezeService implements IceBox.FreezeService
+public class FreezeService extends Ice.LocalObjectImpl implements IceBox.FreezeService
 {
     public void
     start(String name, Ice.Communicator communicator, Ice.Properties properties, String[] args, 
diff --git a/java/test/IcePack/deployer/Service.java b/java/test/IcePack/deployer/Service.java
index 687f802001a..5515f7aaf1b 100644
--- a/java/test/IcePack/deployer/Service.java
+++ b/java/test/IcePack/deployer/Service.java
@@ -8,7 +8,7 @@
 //
 // **********************************************************************
 
-public class Service implements IceBox.Service
+public class Service extends Ice.LocalObjectImpl implements IceBox.Service
 {
     public void
     start(String name, Ice.Communicator communicator, Ice.Properties properties, String[] args)
diff --git a/java/test/IceXML/encoding/Client.java b/java/test/IceXML/encoding/Client.java
index 3adda168200..95356fc0cd0 100644
--- a/java/test/IceXML/encoding/Client.java
+++ b/java/test/IceXML/encoding/Client.java
@@ -374,7 +374,7 @@ public class Client
         }
     }
 
-    private static class Class3Factory implements Ice.ObjectFactory
+    private static class Class3Factory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
     {
         public Ice.Object
         create(String type)
@@ -408,7 +408,7 @@ public class Client
 
         java.io.StringReader sr = new java.io.StringReader(sw.toString());
         Ice.Stream istream = new IceXML.StreamI(communicator, sr);
-        Ice.Object o = Ice.Object.ice_unmarshal(element, istream);
+        Ice.Object o = Ice.ObjectImpl.ice_unmarshal(element, istream);
 
         Test.Class3 out = (Test.Class3)o;
         test(in.c == out.c && in.name.equals(out.name));
@@ -437,7 +437,7 @@ public class Client
 
         java.io.StringReader sr = new java.io.StringReader(sw.toString());
         Ice.Stream istream = new IceXML.StreamI(communicator, sr);
-        Ice.Object o = Ice.Object.ice_unmarshal(element, istream);
+        Ice.Object o = Ice.ObjectImpl.ice_unmarshal(element, istream);
         Test.Class3 out = (Test.Class3)o;
         test(out.r != null);
         test(out.r.r != null);