Expanded tabs into spaces

1 files changed, 1300 insertions, 1300 deletions

diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index 1d59123bec9..83b78ff912d 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -20,473 +20,473 @@ class TwowaysAMI
 
     private static class Callback
     {
-	Callback()
-	{
-	    _called = false;
-	}
-
-	public synchronized boolean
-	check()
-	{
-	    while(!_called)
-	    {
-		try
-		{
-		    wait(5000);
-		}
-		catch(InterruptedException ex)
-		{
-		    continue;
-		}
-
-		if(!_called)
-		{
-		    return false; // Must be timeout.
-		}
-	    }
-
-	    _called = false;
-	    return true;
-	}
-	
-	public synchronized void
-	called()
-	{
-	    assert(!_called);
-	    _called = true;
-	    notify();
-	}
-
-	private boolean _called;
+        Callback()
+        {
+            _called = false;
+        }
+
+        public synchronized boolean
+        check()
+        {
+            while(!_called)
+            {
+                try
+                {
+                    wait(5000);
+                }
+                catch(InterruptedException ex)
+                {
+                    continue;
+                }
+
+                if(!_called)
+                {
+                    return false; // Must be timeout.
+                }
+            }
+
+            _called = false;
+            return true;
+        }
+        
+        public synchronized void
+        called()
+        {
+            assert(!_called);
+            _called = true;
+            notify();
+        }
+
+        private boolean _called;
     }
 
     private static class AMI_MyClass_opVoidI extends Test.AMI_MyClass_opVoid
     {
-	public void
-	ice_response()
-	{
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response()
+        {
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opVoidExI extends Test.AMI_MyClass_opVoid
     {
-	public void
-	ice_response()
-	{
-	    test(false);
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(ex instanceof Ice.TwowayOnlyException);
-	    callback.called();
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response()
+        {
+            test(false);
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(ex instanceof Ice.TwowayOnlyException);
+            callback.called();
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opByteI extends Test.AMI_MyClass_opByte
     {
-	public void
-	ice_response(byte r, byte b)
-	{
-	    test(b == (byte)0xf0);
-	    test(r == (byte)0xff);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(byte r, byte b)
+        {
+            test(b == (byte)0xf0);
+            test(r == (byte)0xff);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opByteExI extends Test.AMI_MyClass_opByte
     {
-	public void
-	ice_response(byte r, byte b)
-	{
-	    test(false);
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(ex instanceof Ice.TwowayOnlyException);
-	    callback.called();
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(byte r, byte b)
+        {
+            test(false);
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(ex instanceof Ice.TwowayOnlyException);
+            callback.called();
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opBoolI extends Test.AMI_MyClass_opBool
     {
-	public void
-	ice_response(boolean r, boolean b)
-	{
-	    test(b);
-	    test(!r);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(boolean r, boolean b)
+        {
+            test(b);
+            test(!r);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opShortIntLongI extends Test.AMI_MyClass_opShortIntLong
     {
-	public void
-	ice_response(long r, short s, int i, long l)
-	{
-	    test(s == 10);
-	    test(i == 11);
-	    test(l == 12);
-	    test(r == 12);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(long r, short s, int i, long l)
+        {
+            test(s == 10);
+            test(i == 11);
+            test(l == 12);
+            test(r == 12);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opFloatDoubleI extends Test.AMI_MyClass_opFloatDouble
     {
-	public void
-	ice_response(double r, float f, double d)
-	{
-	    test(f == 3.14f);
-	    test(d == 1.1E10);
-	    test(r == 1.1E10);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(double r, float f, double d)
+        {
+            test(f == 3.14f);
+            test(d == 1.1E10);
+            test(r == 1.1E10);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opStringI extends Test.AMI_MyClass_opString
     {
-	public void
-	ice_response(String r, String s)
-	{
-	    test(s.equals("world hello"));
-	    test(r.equals("hello world"));
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(String r, String s)
+        {
+            test(s.equals("world hello"));
+            test(r.equals("hello world"));
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opMyEnumI extends Test.AMI_MyClass_opMyEnum
     {
-	public void
-	ice_response(Test.MyEnum r, Test.MyEnum e)
-	{
+        public void
+        ice_response(Test.MyEnum r, Test.MyEnum e)
+        {
             test(e == Test.MyEnum.enum2);
             test(r == Test.MyEnum.enum3);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opMyClassI extends Test.AMI_MyClass_opMyClass
     {
         AMI_MyClass_opMyClassI(Ice.Communicator communicator)
-	{
-	    _communicator = communicator;
-	}
+        {
+            _communicator = communicator;
+        }
 
-	public void
-	ice_response(Test.MyClassPrx r, Test.MyClassPrx c1, Test.MyClassPrx c2)
-	{
+        public void
+        ice_response(Test.MyClassPrx r, Test.MyClassPrx c1, Test.MyClassPrx c2)
+        {
             test(c1.ice_getIdentity().equals(_communicator.stringToIdentity("test")));
             test(c2.ice_getIdentity().equals(_communicator.stringToIdentity("noSuchIdentity")));
             test(r.ice_getIdentity().equals(_communicator.stringToIdentity("test")));
-	    // We can't do the callbacks below in thread per connection mode.
-	    if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0)
-	    {
-		r.opVoid();
-		c1.opVoid();
-		try
-		{
-		    c2.opVoid();
-		    test(false);
-		}
-		catch(Ice.ObjectNotExistException ex)
-		{
-		}
-	    }
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
-	private Ice.Communicator _communicator;
+            // We can't do the callbacks below in thread per connection mode.
+            if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0)
+            {
+                r.opVoid();
+                c1.opVoid();
+                try
+                {
+                    c2.opVoid();
+                    test(false);
+                }
+                catch(Ice.ObjectNotExistException ex)
+                {
+                }
+            }
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
+        private Ice.Communicator _communicator;
     }
 
     private static class AMI_MyClass_opStructI extends Test.AMI_MyClass_opStruct
     {
-	AMI_MyClass_opStructI(Ice.Communicator communicator)
-	{
-	    _communicator = communicator;
-	}
-
-	public void
-	ice_response(Test.Structure rso, Test.Structure so)
-	{
+        AMI_MyClass_opStructI(Ice.Communicator communicator)
+        {
+            _communicator = communicator;
+        }
+
+        public void
+        ice_response(Test.Structure rso, Test.Structure so)
+        {
             test(rso.p == null);
             test(rso.e == Test.MyEnum.enum2);
             test(rso.s.s.equals("def"));
             test(so.e == Test.MyEnum.enum3);
             test(so.s.s.equals("a new string"));
-	    // We can't do the callbacks below in thread per connection mode.
-	    if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0)
-	    {
-		so.p.opVoid();
-	    }
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
-	private Ice.Communicator _communicator;
+            // We can't do the callbacks below in thread per connection mode.
+            if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") == 0)
+            {
+                so.p.opVoid();
+            }
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
+        private Ice.Communicator _communicator;
     }
 
     private static class AMI_MyClass_opByteSI extends Test.AMI_MyClass_opByteS
     {
-	public void
-	ice_response(byte[] rso, byte[] bso)
-	{
-	    test(bso.length == 4);
-	    test(bso[0] == (byte)0x22);
-	    test(bso[1] == (byte)0x12);
-	    test(bso[2] == (byte)0x11);
-	    test(bso[3] == (byte)0x01);
-	    test(rso.length == 8);
-	    test(rso[0] == (byte)0x01);
-	    test(rso[1] == (byte)0x11);
-	    test(rso[2] == (byte)0x12);
-	    test(rso[3] == (byte)0x22);
-	    test(rso[4] == (byte)0xf1);
-	    test(rso[5] == (byte)0xf2);
-	    test(rso[6] == (byte)0xf3);
-	    test(rso[7] == (byte)0xf4);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(byte[] rso, byte[] bso)
+        {
+            test(bso.length == 4);
+            test(bso[0] == (byte)0x22);
+            test(bso[1] == (byte)0x12);
+            test(bso[2] == (byte)0x11);
+            test(bso[3] == (byte)0x01);
+            test(rso.length == 8);
+            test(rso[0] == (byte)0x01);
+            test(rso[1] == (byte)0x11);
+            test(rso[2] == (byte)0x12);
+            test(rso[3] == (byte)0x22);
+            test(rso[4] == (byte)0xf1);
+            test(rso[5] == (byte)0xf2);
+            test(rso[6] == (byte)0xf3);
+            test(rso[7] == (byte)0xf4);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opBoolSI extends Test.AMI_MyClass_opBoolS
     {
-	public void
-	ice_response(boolean[] rso, boolean[] bso)
-	{
-	    test(bso.length == 4);
-	    test(bso[0]);
-	    test(bso[1]);
-	    test(!bso[2]);
-	    test(!bso[3]);
-	    test(rso.length == 3);
-	    test(!rso[0]);
-	    test(rso[1]);
-	    test(rso[2]);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(boolean[] rso, boolean[] bso)
+        {
+            test(bso.length == 4);
+            test(bso[0]);
+            test(bso[1]);
+            test(!bso[2]);
+            test(!bso[3]);
+            test(rso.length == 3);
+            test(!rso[0]);
+            test(rso[1]);
+            test(rso[2]);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opShortIntLongSI extends Test.AMI_MyClass_opShortIntLongS
     {
-	public void
-	ice_response(long[] rso, short[] sso, int[] iso,
-		     long[] lso)
-	{
-	    test(sso.length == 3);
-	    test(sso[0] == 1);
-	    test(sso[1] == 2);
-	    test(sso[2] == 3);
-	    test(iso.length == 4);
-	    test(iso[0] == 8);
-	    test(iso[1] == 7);
-	    test(iso[2] == 6);
-	    test(iso[3] == 5);
-	    test(lso.length == 6);
-	    test(lso[0] == 10);
-	    test(lso[1] == 30);
-	    test(lso[2] == 20);
-	    test(lso[3] == 10);
-	    test(lso[4] == 30);
-	    test(lso[5] == 20);
-	    test(rso.length == 3);
-	    test(rso[0] == 10);
-	    test(rso[1] == 30);
-	    test(rso[2] == 20);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(long[] rso, short[] sso, int[] iso,
+                     long[] lso)
+        {
+            test(sso.length == 3);
+            test(sso[0] == 1);
+            test(sso[1] == 2);
+            test(sso[2] == 3);
+            test(iso.length == 4);
+            test(iso[0] == 8);
+            test(iso[1] == 7);
+            test(iso[2] == 6);
+            test(iso[3] == 5);
+            test(lso.length == 6);
+            test(lso[0] == 10);
+            test(lso[1] == 30);
+            test(lso[2] == 20);
+            test(lso[3] == 10);
+            test(lso[4] == 30);
+            test(lso[5] == 20);
+            test(rso.length == 3);
+            test(rso[0] == 10);
+            test(rso[1] == 30);
+            test(rso[2] == 20);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opFloatDoubleSI extends Test.AMI_MyClass_opFloatDoubleS
     {
-	public void
-	ice_response(double[] rso, float[] fso, double[] dso)
-	{
+        public void
+        ice_response(double[] rso, float[] fso, double[] dso)
+        {
             test(fso.length == 2);
             test(fso[0] == 3.14f);
             test(fso[1] == 1.11f);
@@ -500,29 +500,29 @@ class TwowaysAMI
             test(rso[2] == 1.3E10);
             test((float)rso[3] == 3.14f);
             test((float)rso[4] == 1.11f);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opStringSI extends Test.AMI_MyClass_opStringS
     {
-	public void
-	ice_response(String[] rso, String[] sso)
-	{
+        public void
+        ice_response(String[] rso, String[] sso)
+        {
             test(sso.length == 4);
             test(sso[0].equals("abc"));
             test(sso[1].equals("de"));
@@ -532,160 +532,160 @@ class TwowaysAMI
             test(rso[0].equals("fghi"));
             test(rso[1].equals("de"));
             test(rso[2].equals("abc"));
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opByteSSI extends Test.AMI_MyClass_opByteSS
     {
-	public void
-	ice_response(byte[][] rso, byte[][] bso)
-	{
-	    test(bso.length == 2);
-	    test(bso[0].length == 1);
-	    test(bso[0][0] == (byte)0xff);
-	    test(bso[1].length == 3);
-	    test(bso[1][0] == (byte)0x01);
-	    test(bso[1][1] == (byte)0x11);
-	    test(bso[1][2] == (byte)0x12);
-	    test(rso.length == 4);
-	    test(rso[0].length == 3);
-	    test(rso[0][0] == (byte)0x01);
-	    test(rso[0][1] == (byte)0x11);
-	    test(rso[0][2] == (byte)0x12);
-	    test(rso[1].length == 1);
-	    test(rso[1][0] == (byte)0xff);
-	    test(rso[2].length == 1);
-	    test(rso[2][0] == (byte)0x0e);
-	    test(rso[3].length == 2);
-	    test(rso[3][0] == (byte)0xf2);
-	    test(rso[3][1] == (byte)0xf1);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(byte[][] rso, byte[][] bso)
+        {
+            test(bso.length == 2);
+            test(bso[0].length == 1);
+            test(bso[0][0] == (byte)0xff);
+            test(bso[1].length == 3);
+            test(bso[1][0] == (byte)0x01);
+            test(bso[1][1] == (byte)0x11);
+            test(bso[1][2] == (byte)0x12);
+            test(rso.length == 4);
+            test(rso[0].length == 3);
+            test(rso[0][0] == (byte)0x01);
+            test(rso[0][1] == (byte)0x11);
+            test(rso[0][2] == (byte)0x12);
+            test(rso[1].length == 1);
+            test(rso[1][0] == (byte)0xff);
+            test(rso[2].length == 1);
+            test(rso[2][0] == (byte)0x0e);
+            test(rso[3].length == 2);
+            test(rso[3][0] == (byte)0xf2);
+            test(rso[3][1] == (byte)0xf1);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opBoolSSI extends Test.AMI_MyClass_opBoolSS
     {
-	public void
-	ice_response(boolean[][] rso, boolean[][] bso)
-	{
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(boolean[][] rso, boolean[][] bso)
+        {
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opShortIntLongSSI extends Test.AMI_MyClass_opShortIntLongSS
     {
-	public void
-	ice_response(long[][] rso, short[][] sso, int[][] iso, long[][] lso)
-	{
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(long[][] rso, short[][] sso, int[][] iso, long[][] lso)
+        {
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opFloatDoubleSSI extends Test.AMI_MyClass_opFloatDoubleSS
     {
-	public void
-	ice_response(double[][] rso, float[][] fso, double[][] dso)
-	{
-	    test(fso.length == 3);
-	    test(fso[0].length == 1);
-	    test(fso[0][0] == 3.14f);
-	    test(fso[1].length == 1);
-	    test(fso[1][0] == 1.11f);
-	    test(fso[2].length == 0);
-	    test(dso.length == 1);
-	    test(dso[0].length == 3);
-	    test(dso[0][0] == 1.1E10);
-	    test(dso[0][1] == 1.2E10);
-	    test(dso[0][2] == 1.3E10);
-	    test(rso.length == 2);
-	    test(rso[0].length == 3);
-	    test(rso[0][0] == 1.1E10);
-	    test(rso[0][1] == 1.2E10);
-	    test(rso[0][2] == 1.3E10);
-	    test(rso[1].length == 3);
-	    test(rso[1][0] == 1.1E10);
-	    test(rso[1][1] == 1.2E10);
-	    test(rso[1][2] == 1.3E10);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(double[][] rso, float[][] fso, double[][] dso)
+        {
+            test(fso.length == 3);
+            test(fso[0].length == 1);
+            test(fso[0][0] == 3.14f);
+            test(fso[1].length == 1);
+            test(fso[1][0] == 1.11f);
+            test(fso[2].length == 0);
+            test(dso.length == 1);
+            test(dso[0].length == 3);
+            test(dso[0][0] == 1.1E10);
+            test(dso[0][1] == 1.2E10);
+            test(dso[0][2] == 1.3E10);
+            test(rso.length == 2);
+            test(rso[0].length == 3);
+            test(rso[0][0] == 1.1E10);
+            test(rso[0][1] == 1.2E10);
+            test(rso[0][2] == 1.3E10);
+            test(rso[1].length == 3);
+            test(rso[1][0] == 1.1E10);
+            test(rso[1][1] == 1.2E10);
+            test(rso[1][2] == 1.3E10);
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opStringSSI extends Test.AMI_MyClass_opStringSS
     {
-	public void
-	ice_response(String[][] rso, String[][] sso)
-	{
+        public void
+        ice_response(String[][] rso, String[][] sso)
+        {
             test(sso.length == 5);
             test(sso[0].length == 1);
             test(sso[0][0].equals("abc"));
@@ -701,84 +701,84 @@ class TwowaysAMI
             test(rso[0][0].equals("xyz"));
             test(rso[1].length == 0);
             test(rso[2].length == 0);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opStringSSSI extends Test.AMI_MyClass_opStringSSS
     {
-	public void
-	ice_response(String[][][] rsso, String[][][] ssso)
-	{
-	    test(ssso.length == 5);
-	    test(ssso[0].length == 2);
-	    test(ssso[0][0].length == 2);
-	    test(ssso[0][1].length == 1);
-	    test(ssso[1].length == 1);
-	    test(ssso[1][0].length == 1);
-	    test(ssso[2].length == 2);
-	    test(ssso[2][0].length == 2);
-	    test(ssso[2][1].length == 1);
-	    test(ssso[3].length == 1);
-	    test(ssso[3][0].length == 1);
-	    test(ssso[4].length == 0);
-	    test(ssso[0][0][0].equals("abc"));
-	    test(ssso[0][0][1].equals("de"));
-	    test(ssso[0][1][0].equals("xyz"));
-	    test(ssso[1][0][0].equals("hello"));
-	    test(ssso[2][0][0].equals(""));
-	    test(ssso[2][0][1].equals(""));
-	    test(ssso[2][1][0].equals("abcd"));
-	    test(ssso[3][0][0].equals(""));
-
-	    test(rsso.length == 3);
-	    test(rsso[0].length == 0);
-	    test(rsso[1].length == 1);
-	    test(rsso[1][0].length == 1);
-	    test(rsso[2].length == 2);
-	    test(rsso[2][0].length == 2);
-	    test(rsso[2][1].length == 1);
-	    test(rsso[1][0][0].equals(""));
-	    test(rsso[2][0][0].equals(""));
-	    test(rsso[2][0][1].equals(""));
-	    test(rsso[2][1][0].equals("abcd"));
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response(String[][][] rsso, String[][][] ssso)
+        {
+            test(ssso.length == 5);
+            test(ssso[0].length == 2);
+            test(ssso[0][0].length == 2);
+            test(ssso[0][1].length == 1);
+            test(ssso[1].length == 1);
+            test(ssso[1][0].length == 1);
+            test(ssso[2].length == 2);
+            test(ssso[2][0].length == 2);
+            test(ssso[2][1].length == 1);
+            test(ssso[3].length == 1);
+            test(ssso[3][0].length == 1);
+            test(ssso[4].length == 0);
+            test(ssso[0][0][0].equals("abc"));
+            test(ssso[0][0][1].equals("de"));
+            test(ssso[0][1][0].equals("xyz"));
+            test(ssso[1][0][0].equals("hello"));
+            test(ssso[2][0][0].equals(""));
+            test(ssso[2][0][1].equals(""));
+            test(ssso[2][1][0].equals("abcd"));
+            test(ssso[3][0][0].equals(""));
+
+            test(rsso.length == 3);
+            test(rsso[0].length == 0);
+            test(rsso[1].length == 1);
+            test(rsso[1][0].length == 1);
+            test(rsso[2].length == 2);
+            test(rsso[2][0].length == 2);
+            test(rsso[2][1].length == 1);
+            test(rsso[1][0][0].equals(""));
+            test(rsso[2][0][0].equals(""));
+            test(rsso[2][0][1].equals(""));
+            test(rsso[2][1][0].equals("abcd"));
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opByteBoolDI extends Test.AMI_MyClass_opByteBoolD
     {
-	public void
-	ice_response(java.util.Map ro, java.util.Map _do)
-	{
+        public void
+        ice_response(java.util.Map ro, java.util.Map _do)
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put(new Byte((byte)10), Boolean.TRUE);
             di1.put(new Byte((byte)100), Boolean.FALSE);
@@ -788,29 +788,29 @@ class TwowaysAMI
             test(((Boolean)ro.get(new Byte((byte)11))).booleanValue() == false);
             test(((Boolean)ro.get(new Byte((byte)100))).booleanValue() == false);
             test(((Boolean)ro.get(new Byte((byte)101))).booleanValue() == true);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opShortIntDI extends Test.AMI_MyClass_opShortIntD
     {
-	public void
-	ice_response(java.util.Map ro, java.util.Map _do)
-	{
+        public void
+        ice_response(java.util.Map ro, java.util.Map _do)
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put(new Short((short)110), new Integer(-1));
             di1.put(new Short((short)1100), new Integer(123123));
@@ -820,29 +820,29 @@ class TwowaysAMI
             test(((Integer)ro.get(new Short((short)111))).intValue() == -100);
             test(((Integer)ro.get(new Short((short)1100))).intValue() == 123123);
             test(((Integer)ro.get(new Short((short)1101))).intValue() == 0);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opLongFloatDI extends Test.AMI_MyClass_opLongFloatD
     {
-	public void
-	ice_response(java.util.Map ro, java.util.Map _do)
-	{
+        public void
+        ice_response(java.util.Map ro, java.util.Map _do)
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put(new Long(999999110L), new Float(-1.1f));
             di1.put(new Long(999999111L), new Float(123123.2f));
@@ -852,29 +852,29 @@ class TwowaysAMI
             test(((Float)ro.get(new Long(999999120L))).floatValue() == -100.4f);
             test(((Float)ro.get(new Long(999999111L))).floatValue() == 123123.2f);
             test(((Float)ro.get(new Long(999999130L))).floatValue() == 0.5f);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opStringStringDI extends Test.AMI_MyClass_opStringStringD
     {
-	public void
-	ice_response(java.util.Map ro, java.util.Map _do)
-	{
+        public void
+        ice_response(java.util.Map ro, java.util.Map _do)
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put("foo", "abc -1.1");
             di1.put("bar", "abc 123123.2");
@@ -884,29 +884,29 @@ class TwowaysAMI
             test(((String)ro.get("FOO")).equals("abc -100.4"));
             test(((String)ro.get("bar")).equals("abc 123123.2"));
             test(((String)ro.get("BAR")).equals("abc 0.5"));
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opStringMyEnumDI extends Test.AMI_MyClass_opStringMyEnumD
     {
-	public void
-	ice_response(java.util.Map ro, java.util.Map _do)
-	{
+        public void
+        ice_response(java.util.Map ro, java.util.Map _do)
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put("abc", Test.MyEnum.enum1);
             di1.put("", Test.MyEnum.enum2);
@@ -916,254 +916,254 @@ class TwowaysAMI
             test(((Test.MyEnum)ro.get("qwerty")) == Test.MyEnum.enum3);
             test(((Test.MyEnum)ro.get("")) == Test.MyEnum.enum2);
             test(((Test.MyEnum)ro.get("Hello!!")) == Test.MyEnum.enum2);
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opIntSI extends Test.AMI_MyClass_opIntS
     {
         AMI_MyClass_opIntSI(int l)
-	{
-	    _l = l;
-	}
-
-	public void
-	ice_response(int[] r)
-	{
-	    test(r.length == _l);
-	    for(int j = 0; j < r.length; ++j)
-	    {
-	        test(r[j] == -j);
-	    }
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private int _l;
-	private Callback callback = new Callback();
+        {
+            _l = l;
+        }
+
+        public void
+        ice_response(int[] r)
+        {
+            test(r.length == _l);
+            for(int j = 0; j < r.length; ++j)
+            {
+                test(r[j] == -j);
+            }
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private int _l;
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opContextEqualI extends Test.AMI_MyClass_opContext
     {
         AMI_MyClass_opContextEqualI(java.util.Map d)
-	{
-	    _d = d;
-	}
-
-	public void
-	ice_response(java.util.Map r)
-	{
-	    test(r.equals(_d));
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private java.util.Map _d;
-	private Callback callback = new Callback();
+        {
+            _d = d;
+        }
+
+        public void
+        ice_response(java.util.Map r)
+        {
+            test(r.equals(_d));
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private java.util.Map _d;
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opContextNotEqualI extends Test.AMI_MyClass_opContext
     {
         AMI_MyClass_opContextNotEqualI(java.util.Map d)
-	{
-	    _d = d;
-	}
-
-	public void
-	ice_response(java.util.Map r)
-	{
-	    test(!r.equals(_d));
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private java.util.Map _d;
-	private Callback callback = new Callback();
+        {
+            _d = d;
+        }
+
+        public void
+        ice_response(java.util.Map r)
+        {
+            test(!r.equals(_d));
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private java.util.Map _d;
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyDerivedClass_opDerivedI extends Test.AMI_MyDerivedClass_opDerived
     {
-	public void
-	ice_response()
-	{
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response()
+        {
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     private static class AMI_MyClass_opDoubleMarshalingI extends Test.AMI_MyClass_opDoubleMarshaling
     {
-	public void
-	ice_response()
-	{
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
+        public void
+        ice_response()
+        {
+            callback.called();
+        }
+
+        public void
+        ice_exception(Ice.LocalException ex)
+        {
+            test(false);
+        }
+
+        public boolean
+        check()
+        {
+            return callback.check();
+        }
+
+        private Callback callback = new Callback();
     }
 
     static void
     twowaysAMI(Ice.Communicator communicator, Test.MyClassPrx p)
     {
         {
-	    // Check that a call to a void operation raises TwowayOnlyException
-	    // in the ice_exception() callback instead of at the point of call.
-	    Test.MyClassPrx oneway = Test.MyClassPrxHelper.uncheckedCast(p.ice_oneway());
-	    AMI_MyClass_opVoidExI cb = new AMI_MyClass_opVoidExI();
-	    try
-	    {
-	        oneway.opVoid_async(cb);
-	    }
-	    catch(java.lang.Exception ex)
-	    {
-	        test(false);
-	    }
-	    test(cb.check());
-	}
-
-	{
-	    // Check that a call to a twoway operation raises TwowayOnlyException
-	    // in the ice_exception() callback instead of at the point of call.
-	    Test.MyClassPrx oneway = Test.MyClassPrxHelper.uncheckedCast(p.ice_oneway());
-	    AMI_MyClass_opByteExI cb = new AMI_MyClass_opByteExI();
-	    try
-	    {
-	        oneway.opByte_async(cb, (byte)0, (byte)0);
-	    }
-	    catch(java.lang.Exception ex)
-	    {
-	        test(false);
-	    }
-	    test(cb.check());
-	}
-
-	{
-	    AMI_MyClass_opVoidI cb = new AMI_MyClass_opVoidI();
-	    p.opVoid_async(cb);
-	    test(cb.check());
-	    // Let's check if we can reuse the same callback object for another call.
-	    p.opVoid_async(cb);
-	    test(cb.check());
-	}
-
-	{
-	    AMI_MyClass_opByteI cb = new AMI_MyClass_opByteI();
-	    p.opByte_async(cb, (byte)0xff, (byte)0x0f);
-	    test(cb.check());
-	}
-
-	{
-	    AMI_MyClass_opBoolI cb = new AMI_MyClass_opBoolI();
-	    p.opBool_async(cb, true, false);
-	    test(cb.check());
-	}
-	
-	{
-	    AMI_MyClass_opShortIntLongI cb = new AMI_MyClass_opShortIntLongI();
-	    p.opShortIntLong_async(cb, (short)10, 11, 12L);
-	    test(cb.check());
-	}
-	
-	{
-	    AMI_MyClass_opFloatDoubleI cb = new AMI_MyClass_opFloatDoubleI();
-	    p.opFloatDouble_async(cb, 3.14f, 1.1E10);
-	    test(cb.check());
-	    // Let's check if we can reuse the same callback object for another call.
-	    p.opFloatDouble_async(cb, 3.14f, 1.1E10);
-	    test(cb.check());
-	}
-	
-	{
-	    AMI_MyClass_opStringI cb = new AMI_MyClass_opStringI();
-	    p.opString_async(cb, "hello", "world");
-	    test(cb.check());
-	}
-	
-	{
-	    AMI_MyClass_opMyEnumI cb = new AMI_MyClass_opMyEnumI();
-	    p.opMyEnum_async(cb, Test.MyEnum.enum2);
-	    test(cb.check());
-	}
-	
-	{
-	    AMI_MyClass_opMyClassI cb = new AMI_MyClass_opMyClassI(communicator);
-	    p.opMyClass_async(cb, p);
-	    test(cb.check());
-	}
-	
-	{
+            // Check that a call to a void operation raises TwowayOnlyException
+            // in the ice_exception() callback instead of at the point of call.
+            Test.MyClassPrx oneway = Test.MyClassPrxHelper.uncheckedCast(p.ice_oneway());
+            AMI_MyClass_opVoidExI cb = new AMI_MyClass_opVoidExI();
+            try
+            {
+                oneway.opVoid_async(cb);
+            }
+            catch(java.lang.Exception ex)
+            {
+                test(false);
+            }
+            test(cb.check());
+        }
+
+        {
+            // Check that a call to a twoway operation raises TwowayOnlyException
+            // in the ice_exception() callback instead of at the point of call.
+            Test.MyClassPrx oneway = Test.MyClassPrxHelper.uncheckedCast(p.ice_oneway());
+            AMI_MyClass_opByteExI cb = new AMI_MyClass_opByteExI();
+            try
+            {
+                oneway.opByte_async(cb, (byte)0, (byte)0);
+            }
+            catch(java.lang.Exception ex)
+            {
+                test(false);
+            }
+            test(cb.check());
+        }
+
+        {
+            AMI_MyClass_opVoidI cb = new AMI_MyClass_opVoidI();
+            p.opVoid_async(cb);
+            test(cb.check());
+            // Let's check if we can reuse the same callback object for another call.
+            p.opVoid_async(cb);
+            test(cb.check());
+        }
+
+        {
+            AMI_MyClass_opByteI cb = new AMI_MyClass_opByteI();
+            p.opByte_async(cb, (byte)0xff, (byte)0x0f);
+            test(cb.check());
+        }
+
+        {
+            AMI_MyClass_opBoolI cb = new AMI_MyClass_opBoolI();
+            p.opBool_async(cb, true, false);
+            test(cb.check());
+        }
+        
+        {
+            AMI_MyClass_opShortIntLongI cb = new AMI_MyClass_opShortIntLongI();
+            p.opShortIntLong_async(cb, (short)10, 11, 12L);
+            test(cb.check());
+        }
+        
+        {
+            AMI_MyClass_opFloatDoubleI cb = new AMI_MyClass_opFloatDoubleI();
+            p.opFloatDouble_async(cb, 3.14f, 1.1E10);
+            test(cb.check());
+            // Let's check if we can reuse the same callback object for another call.
+            p.opFloatDouble_async(cb, 3.14f, 1.1E10);
+            test(cb.check());
+        }
+        
+        {
+            AMI_MyClass_opStringI cb = new AMI_MyClass_opStringI();
+            p.opString_async(cb, "hello", "world");
+            test(cb.check());
+        }
+        
+        {
+            AMI_MyClass_opMyEnumI cb = new AMI_MyClass_opMyEnumI();
+            p.opMyEnum_async(cb, Test.MyEnum.enum2);
+            test(cb.check());
+        }
+        
+        {
+            AMI_MyClass_opMyClassI cb = new AMI_MyClass_opMyClassI(communicator);
+            p.opMyClass_async(cb, p);
+            test(cb.check());
+        }
+        
+        {
             Test.Structure si1 = new Test.Structure();
             si1.p = p;
             si1.e = Test.MyEnum.enum3;
@@ -1174,165 +1174,165 @@ class TwowaysAMI
             si2.e = Test.MyEnum.enum2;
             si2.s = new Test.AnotherStruct();
             si2.s.s = "def";
-	    
-	    AMI_MyClass_opStructI cb = new AMI_MyClass_opStructI(communicator);
-	    p.opStruct_async(cb, si1, si2);
-	    test(cb.check());
-	}
-	
-	{
+            
+            AMI_MyClass_opStructI cb = new AMI_MyClass_opStructI(communicator);
+            p.opStruct_async(cb, si1, si2);
+            test(cb.check());
+        }
+        
+        {
             final byte[] bsi1 =
-		{
-		    (byte)0x01,
-		    (byte)0x11,
-		    (byte)0x12,
-		    (byte)0x22
-		};
+                {
+                    (byte)0x01,
+                    (byte)0x11,
+                    (byte)0x12,
+                    (byte)0x22
+                };
             final byte[] bsi2 =
-		{
-		    (byte)0xf1,
-		    (byte)0xf2,
-		    (byte)0xf3,
-		    (byte)0xf4
-		};
-	    
-	    AMI_MyClass_opByteSI cb = new AMI_MyClass_opByteSI();
-	    p.opByteS_async(cb, bsi1, bsi2);
-	    test(cb.check());
-	}
-	
-	{
+                {
+                    (byte)0xf1,
+                    (byte)0xf2,
+                    (byte)0xf3,
+                    (byte)0xf4
+                };
+            
+            AMI_MyClass_opByteSI cb = new AMI_MyClass_opByteSI();
+            p.opByteS_async(cb, bsi1, bsi2);
+            test(cb.check());
+        }
+        
+        {
             final boolean[] bsi1 = { true, true, false };
             final boolean[] bsi2 = { false };
-	    
-	    AMI_MyClass_opBoolSI cb = new AMI_MyClass_opBoolSI();
-	    p.opBoolS_async(cb, bsi1, bsi2);
-	    test(cb.check());
-	}
-	
-	{
+            
+            AMI_MyClass_opBoolSI cb = new AMI_MyClass_opBoolSI();
+            p.opBoolS_async(cb, bsi1, bsi2);
+            test(cb.check());
+        }
+        
+        {
             final short[] ssi = { 1, 2, 3 };
             final int[] isi = { 5, 6, 7, 8 };
             final long[] lsi = { 10, 30, 20 };
-	    
-	    AMI_MyClass_opShortIntLongSI cb = new AMI_MyClass_opShortIntLongSI();
-	    p.opShortIntLongS_async(cb, ssi, isi, lsi);
-	    test(cb.check());
-	}
-	
-	{
+            
+            AMI_MyClass_opShortIntLongSI cb = new AMI_MyClass_opShortIntLongSI();
+            p.opShortIntLongS_async(cb, ssi, isi, lsi);
+            test(cb.check());
+        }
+        
+        {
             final float[] fsi = { 3.14f, 1.11f };
             final double[] dsi = { 1.1E10, 1.2E10, 1.3E10 };
-	    
-	    AMI_MyClass_opFloatDoubleSI cb = new AMI_MyClass_opFloatDoubleSI();
-	    p.opFloatDoubleS_async(cb, fsi, dsi);
-	    test(cb.check());
-	}
-	
-	{
+            
+            AMI_MyClass_opFloatDoubleSI cb = new AMI_MyClass_opFloatDoubleSI();
+            p.opFloatDoubleS_async(cb, fsi, dsi);
+            test(cb.check());
+        }
+        
+        {
             final String[] ssi1 = { "abc", "de", "fghi" };
             final String[] ssi2 = { "xyz" };
-	    
-	    AMI_MyClass_opStringSI cb = new AMI_MyClass_opStringSI();
-	    p.opStringS_async(cb, ssi1, ssi2);
-	    test(cb.check());
-	}
-	
-	{
+            
+            AMI_MyClass_opStringSI cb = new AMI_MyClass_opStringSI();
+            p.opStringS_async(cb, ssi1, ssi2);
+            test(cb.check());
+        }
+        
+        {
             final byte[][] bsi1 =
-		{
-		    { (byte)0x01, (byte)0x11, (byte)0x12 },
-		    { (byte)0xff }
-		};
+                {
+                    { (byte)0x01, (byte)0x11, (byte)0x12 },
+                    { (byte)0xff }
+                };
             final byte[][] bsi2 =
-		{
-		    { (byte)0x0e },
-		    { (byte)0xf2, (byte)0xf1 }
-		};
-
-	    AMI_MyClass_opByteSSI cb = new AMI_MyClass_opByteSSI();
-	    p.opByteSS_async(cb, bsi1, bsi2);
-	    test(cb.check());
-	}
+                {
+                    { (byte)0x0e },
+                    { (byte)0xf2, (byte)0xf1 }
+                };
+
+            AMI_MyClass_opByteSSI cb = new AMI_MyClass_opByteSSI();
+            p.opByteSS_async(cb, bsi1, bsi2);
+            test(cb.check());
+        }
 
-	{
+        {
             final float[][] fsi =
-		{
-		    { 3.14f },
-		    { 1.11f },
-		    { },
-		};
+                {
+                    { 3.14f },
+                    { 1.11f },
+                    { },
+                };
             final double[][] dsi =
-		{
-		    { 1.1E10, 1.2E10, 1.3E10 }
-		};
+                {
+                    { 1.1E10, 1.2E10, 1.3E10 }
+                };
 
-	    AMI_MyClass_opFloatDoubleSSI cb = new AMI_MyClass_opFloatDoubleSSI();
-	    p.opFloatDoubleSS_async(cb, fsi, dsi);
-	    test(cb.check());
-	}
+            AMI_MyClass_opFloatDoubleSSI cb = new AMI_MyClass_opFloatDoubleSSI();
+            p.opFloatDoubleSS_async(cb, fsi, dsi);
+            test(cb.check());
+        }
 
-	{
+        {
             final String[][] ssi1 =
-		{
-		    { "abc" },
-		    { "de", "fghi" }
-		};
+                {
+                    { "abc" },
+                    { "de", "fghi" }
+                };
             final String[][] ssi2 =
-		{
-		    { },
-		    { },
-		    { "xyz" }
-		};
-
-	    AMI_MyClass_opStringSSI cb = new AMI_MyClass_opStringSSI();
-	    p.opStringSS_async(cb, ssi1, ssi2);
-	    test(cb.check());
-	}
-
-	{
-	    final String[][][] sssi1 =
-	    {
-		{
-		    {
-			"abc", "de"
-		    },
-		    {
-			"xyz"
-		    }
-		},
-		{
-		    {
-			"hello"
-		    }
-		}
-	    };
-
-	    final String[][][] sssi2 =
-	    {
-		{
-		    {
-			"", ""
-		    },
-		    {
-			"abcd"
-		    }
-		},
-		{
-		    {
-			""
-		    }
-		},
-		{
-		}
-	    };
-
-	    AMI_MyClass_opStringSSSI cb = new AMI_MyClass_opStringSSSI();
-	    p.opStringSSS_async(cb, sssi1, sssi2);
-	    test(cb.check());
-	}
-
-	{
+                {
+                    { },
+                    { },
+                    { "xyz" }
+                };
+
+            AMI_MyClass_opStringSSI cb = new AMI_MyClass_opStringSSI();
+            p.opStringSS_async(cb, ssi1, ssi2);
+            test(cb.check());
+        }
+
+        {
+            final String[][][] sssi1 =
+            {
+                {
+                    {
+                        "abc", "de"
+                    },
+                    {
+                        "xyz"
+                    }
+                },
+                {
+                    {
+                        "hello"
+                    }
+                }
+            };
+
+            final String[][][] sssi2 =
+            {
+                {
+                    {
+                        "", ""
+                    },
+                    {
+                        "abcd"
+                    }
+                },
+                {
+                    {
+                        ""
+                    }
+                },
+                {
+                }
+            };
+
+            AMI_MyClass_opStringSSSI cb = new AMI_MyClass_opStringSSSI();
+            p.opStringSSS_async(cb, sssi1, sssi2);
+            test(cb.check());
+        }
+
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put(new Byte((byte)10), Boolean.TRUE);
             di1.put(new Byte((byte)100), Boolean.FALSE);
@@ -1341,12 +1341,12 @@ class TwowaysAMI
             di2.put(new Byte((byte)11), Boolean.FALSE);
             di2.put(new Byte((byte)101), Boolean.TRUE);
 
-	    AMI_MyClass_opByteBoolDI cb = new AMI_MyClass_opByteBoolDI();
-	    p.opByteBoolD_async(cb, di1, di2);
-	    test(cb.check());
-	}
+            AMI_MyClass_opByteBoolDI cb = new AMI_MyClass_opByteBoolDI();
+            p.opByteBoolD_async(cb, di1, di2);
+            test(cb.check());
+        }
 
-	{
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put(new Short((short)110), new Integer(-1));
             di1.put(new Short((short)1100), new Integer(123123));
@@ -1355,12 +1355,12 @@ class TwowaysAMI
             di2.put(new Short((short)111), new Integer(-100));
             di2.put(new Short((short)1101), new Integer(0));
 
-	    AMI_MyClass_opShortIntDI cb = new AMI_MyClass_opShortIntDI();
-	    p.opShortIntD_async(cb, di1, di2);
-	    test(cb.check());
-	}
+            AMI_MyClass_opShortIntDI cb = new AMI_MyClass_opShortIntDI();
+            p.opShortIntD_async(cb, di1, di2);
+            test(cb.check());
+        }
 
-	{
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put(new Long(999999110L), new Float(-1.1f));
             di1.put(new Long(999999111L), new Float(123123.2f));
@@ -1369,12 +1369,12 @@ class TwowaysAMI
             di2.put(new Long(999999120L), new Float(-100.4f));
             di2.put(new Long(999999130L), new Float(0.5f));
 
-	    AMI_MyClass_opLongFloatDI cb = new AMI_MyClass_opLongFloatDI();
-	    p.opLongFloatD_async(cb, di1, di2);
-	    test(cb.check());
-	}
+            AMI_MyClass_opLongFloatDI cb = new AMI_MyClass_opLongFloatDI();
+            p.opLongFloatD_async(cb, di1, di2);
+            test(cb.check());
+        }
 
-	{
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put("foo", "abc -1.1");
             di1.put("bar", "abc 123123.2");
@@ -1383,12 +1383,12 @@ class TwowaysAMI
             di2.put("FOO", "abc -100.4");
             di2.put("BAR", "abc 0.5");
 
-	    AMI_MyClass_opStringStringDI cb = new AMI_MyClass_opStringStringDI();
-	    p.opStringStringD_async(cb, di1, di2);
-	    test(cb.check());
-	}
+            AMI_MyClass_opStringStringDI cb = new AMI_MyClass_opStringStringDI();
+            p.opStringStringD_async(cb, di1, di2);
+            test(cb.check());
+        }
 
-	{
+        {
             java.util.Map di1 = new java.util.HashMap();
             di1.put("abc", Test.MyEnum.enum1);
             di1.put("", Test.MyEnum.enum2);
@@ -1397,235 +1397,235 @@ class TwowaysAMI
             di2.put("qwerty", Test.MyEnum.enum3);
             di2.put("Hello!!", Test.MyEnum.enum2);
 
-	    AMI_MyClass_opStringMyEnumDI cb = new AMI_MyClass_opStringMyEnumDI();
-	    p.opStringMyEnumD_async(cb, di1, di2);
-	    test(cb.check());
-	}
-
-	{
-	    int[] lengths = { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
-
-	    for(int l = 0; l < lengths.length; ++l)
-	    {
-	        int[] s = new int[lengths[l]];
-		for(int i = 0; i < s.length; ++i)
-		{
-		    s[i] = i;
-		}
-		AMI_MyClass_opIntSI cb = new AMI_MyClass_opIntSI(lengths[l]);
-		p.opIntS_async(cb, s);
-		test(cb.check());
-	    }
-	}
-
-	{
-	    java.util.Map ctx = new java.util.HashMap();
-	    ctx.put("one", "ONE");
-	    ctx.put("two", "TWO");
-	    ctx.put("three", "THREE");
-	    {
-		test(p.ice_getContext().isEmpty());
-		AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(ctx);
-		p.opContext_async(cb);
-		test(cb.check());
-	    }
-	    {
-		test(p.ice_getContext().isEmpty());
-		AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
-		p.opContext_async(cb, ctx);
-		test(cb.check());
-	    }
-	    Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-	    test(p2.ice_getContext().equals(ctx));
-	    {
-		AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
-		p2.opContext_async(cb);
-		test(cb.check());
-	    }
-	    {
-		AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
-		p2.opContext_async(cb, ctx);
-		test(cb.check());
-	    }
-
-	    {
-		//
-		// Test that default context is obtained correctly from communicator.
-		//
+            AMI_MyClass_opStringMyEnumDI cb = new AMI_MyClass_opStringMyEnumDI();
+            p.opStringMyEnumD_async(cb, di1, di2);
+            test(cb.check());
+        }
+
+        {
+            int[] lengths = { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
+
+            for(int l = 0; l < lengths.length; ++l)
+            {
+                int[] s = new int[lengths[l]];
+                for(int i = 0; i < s.length; ++i)
+                {
+                    s[i] = i;
+                }
+                AMI_MyClass_opIntSI cb = new AMI_MyClass_opIntSI(lengths[l]);
+                p.opIntS_async(cb, s);
+                test(cb.check());
+            }
+        }
+
+        {
+            java.util.Map ctx = new java.util.HashMap();
+            ctx.put("one", "ONE");
+            ctx.put("two", "TWO");
+            ctx.put("three", "THREE");
+            {
+                test(p.ice_getContext().isEmpty());
+                AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(ctx);
+                p.opContext_async(cb);
+                test(cb.check());
+            }
+            {
+                test(p.ice_getContext().isEmpty());
+                AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
+                p.opContext_async(cb, ctx);
+                test(cb.check());
+            }
+            Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
+            test(p2.ice_getContext().equals(ctx));
+            {
+                AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
+                p2.opContext_async(cb);
+                test(cb.check());
+            }
+            {
+                AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
+                p2.opContext_async(cb, ctx);
+                test(cb.check());
+            }
+
+            {
+                //
+                // Test that default context is obtained correctly from communicator.
+                //
 /* DEPRECATED
-		java.util.HashMap dflt = new java.util.HashMap();
-		dflt.put("a", "b");
-		communicator.setDefaultContext(dflt);
-		{
-		    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(dflt);
-		    p.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap()));
-		{
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(new java.util.HashMap());
-		    p2.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
-		{
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(dflt);
-		    p2.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		communicator.setDefaultContext(new java.util.HashMap());
-		{
-		    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(new java.util.HashMap());
-		    p2.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		communicator.setDefaultContext(dflt);
-		Test.MyClassPrx c = Test.MyClassPrxHelper.checkedCast(
-						communicator.stringToProxy("test:default -p 12010 -t 10000"));
-		{
-		    java.util.HashMap tmp = new java.util.HashMap();
-		    tmp.put("a", "b");
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-		    c.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		dflt.put("a", "c");
-		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
-		{
-		    java.util.HashMap tmp = new java.util.HashMap();
-		    tmp.put("a", "c");
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-		    c2.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		dflt.clear();
-		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
-		{
-		    java.util.HashMap tmp = new java.util.HashMap();
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-		    c3.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		Test.MyClassPrx c4 = Test.MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
-		{
-		    java.util.HashMap tmp = new java.util.HashMap();
-		    tmp.put("a", "b");
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-		    c4.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		dflt.put("a", "d");
-		communicator.setDefaultContext(dflt);
-
-		Test.MyClassPrx c5 = Test.MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
-		{
-		    java.util.HashMap tmp = new java.util.HashMap();
-		    tmp.put("a", "d");
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-		    c5.opContext_async(cb);
-		    test(cb.check());
-		}
-
-		communicator.setDefaultContext(new java.util.HashMap());
+                java.util.HashMap dflt = new java.util.HashMap();
+                dflt.put("a", "b");
+                communicator.setDefaultContext(dflt);
+                {
+                    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(dflt);
+                    p.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap()));
+                {
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(new java.util.HashMap());
+                    p2.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
+                {
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(dflt);
+                    p2.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                communicator.setDefaultContext(new java.util.HashMap());
+                {
+                    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(new java.util.HashMap());
+                    p2.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                communicator.setDefaultContext(dflt);
+                Test.MyClassPrx c = Test.MyClassPrxHelper.checkedCast(
+                                                communicator.stringToProxy("test:default -p 12010 -t 10000"));
+                {
+                    java.util.HashMap tmp = new java.util.HashMap();
+                    tmp.put("a", "b");
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
+                    c.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                dflt.put("a", "c");
+                Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
+                {
+                    java.util.HashMap tmp = new java.util.HashMap();
+                    tmp.put("a", "c");
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
+                    c2.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                dflt.clear();
+                Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
+                {
+                    java.util.HashMap tmp = new java.util.HashMap();
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
+                    c3.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                Test.MyClassPrx c4 = Test.MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
+                {
+                    java.util.HashMap tmp = new java.util.HashMap();
+                    tmp.put("a", "b");
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
+                    c4.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                dflt.put("a", "d");
+                communicator.setDefaultContext(dflt);
+
+                Test.MyClassPrx c5 = Test.MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
+                {
+                    java.util.HashMap tmp = new java.util.HashMap();
+                    tmp.put("a", "d");
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
+                    c5.opContext_async(cb);
+                    test(cb.check());
+                }
+
+                communicator.setDefaultContext(new java.util.HashMap());
 */
-	    }
-	}
-
-	{
-	    //
-	    // Test implicit context propagation
-	    //
-	    
-	    String[] impls = {"Shared", "SharedWithoutLocking", "PerThread"};
-	    for(int i = 0; i < 3; i++)
-	    {
-		Ice.InitializationData initData = new Ice.InitializationData();
-		initData.properties = communicator.getProperties()._clone();
-		initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
-		
-		Ice.Communicator ic = Ice.Util.initialize(initData);
-		
-		java.util.Map ctx = new java.util.HashMap();
-		ctx.put("one", "ONE");
-		ctx.put("two", "TWO");
-		ctx.put("three", "THREE");
-		
-		Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(
-		    ic.stringToProxy("test:default -p 12010 -t 10000"));
-		
-		ic.getImplicitContext().setContext(ctx);
-		test(ic.getImplicitContext().getContext().equals(ctx));
-		{
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
-		    p3.opContext_async(cb);
-		    test(cb.check());
-		}
-		
-		ic.getImplicitContext().set("zero", "ZERO");
-		test(ic.getImplicitContext().get("zero").equals("ZERO"));
-		test(ic.getImplicitContext().getWithDefault("foobar", "foo").equals("foo"));
-		
-		ctx = ic.getImplicitContext().getContext();
-		{
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
-		    p3.opContext_async(cb);
-		    test(cb.check());
-		}
-		
-		java.util.Map prxContext = new java.util.HashMap();
-		prxContext.put("one", "UN");
-		prxContext.put("four", "QUATRE");
-		
-		java.util.Map combined = new java.util.HashMap(ctx);
-		combined.putAll(prxContext);
-		test(combined.get("one").equals("UN"));
-		
-		p3 = Test.MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
-		
-		ic.getImplicitContext().setContext(null);
-		{
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(prxContext);
-		    p3.opContext_async(cb);
-		    test(cb.check());
-		}
-		
-		ic.getImplicitContext().setContext(ctx);
-		{
-		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(combined);
-		    p3.opContext_async(cb);
-		    test(cb.check());
-		}
-		
-		ic.destroy();
-	    }
-	}
-
-	{
-	    double d = 1278312346.0 / 13.0;
-	    double[] ds = new double[5];
-	    for(int i = 0; i < 5; i++)
-	    {
-		ds[i] = d;
-	    }
-	    AMI_MyClass_opDoubleMarshalingI cb = new AMI_MyClass_opDoubleMarshalingI();
-	    p.opDoubleMarshaling_async(cb, d, ds);
-	    test(cb.check());
-	}
-
-	{
-	    Test.MyDerivedClassPrx derived = Test.MyDerivedClassPrxHelper.checkedCast(p);
-	    test(derived != null);
-	    AMI_MyDerivedClass_opDerivedI cb = new AMI_MyDerivedClass_opDerivedI();
-	    derived.opDerived_async(cb);
-	    test(cb.check());
-	}
+            }
+        }
+
+        {
+            //
+            // Test implicit context propagation
+            //
+            
+            String[] impls = {"Shared", "SharedWithoutLocking", "PerThread"};
+            for(int i = 0; i < 3; i++)
+            {
+                Ice.InitializationData initData = new Ice.InitializationData();
+                initData.properties = communicator.getProperties()._clone();
+                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
+                
+                Ice.Communicator ic = Ice.Util.initialize(initData);
+                
+                java.util.Map ctx = new java.util.HashMap();
+                ctx.put("one", "ONE");
+                ctx.put("two", "TWO");
+                ctx.put("three", "THREE");
+                
+                Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(
+                    ic.stringToProxy("test:default -p 12010 -t 10000"));
+                
+                ic.getImplicitContext().setContext(ctx);
+                test(ic.getImplicitContext().getContext().equals(ctx));
+                {
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
+                    p3.opContext_async(cb);
+                    test(cb.check());
+                }
+                
+                ic.getImplicitContext().set("zero", "ZERO");
+                test(ic.getImplicitContext().get("zero").equals("ZERO"));
+                test(ic.getImplicitContext().getWithDefault("foobar", "foo").equals("foo"));
+                
+                ctx = ic.getImplicitContext().getContext();
+                {
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
+                    p3.opContext_async(cb);
+                    test(cb.check());
+                }
+                
+                java.util.Map prxContext = new java.util.HashMap();
+                prxContext.put("one", "UN");
+                prxContext.put("four", "QUATRE");
+                
+                java.util.Map combined = new java.util.HashMap(ctx);
+                combined.putAll(prxContext);
+                test(combined.get("one").equals("UN"));
+                
+                p3 = Test.MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
+                
+                ic.getImplicitContext().setContext(null);
+                {
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(prxContext);
+                    p3.opContext_async(cb);
+                    test(cb.check());
+                }
+                
+                ic.getImplicitContext().setContext(ctx);
+                {
+                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(combined);
+                    p3.opContext_async(cb);
+                    test(cb.check());
+                }
+                
+                ic.destroy();
+            }
+        }
+
+        {
+            double d = 1278312346.0 / 13.0;
+            double[] ds = new double[5];
+            for(int i = 0; i < 5; i++)
+            {
+                ds[i] = d;
+            }
+            AMI_MyClass_opDoubleMarshalingI cb = new AMI_MyClass_opDoubleMarshalingI();
+            p.opDoubleMarshaling_async(cb, d, ds);
+            test(cb.check());
+        }
+
+        {
+            Test.MyDerivedClassPrx derived = Test.MyDerivedClassPrxHelper.checkedCast(p);
+            test(derived != null);
+            AMI_MyDerivedClass_opDerivedI cb = new AMI_MyDerivedClass_opDerivedI();
+            derived.opDerived_async(cb);
+            test(cb.check());
+        }
     }
 }