outgoing.abort

6 files changed, 28 insertions, 1 deletions

diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java
index 496b377b447..a53b1c88aad 100644
--- a/java/test/Ice/operations/AllTests.java
+++ b/java/test/Ice/operations/AllTests.java
@@ -53,6 +53,12 @@ public class AllTests
 	    TwowaysAMI.twowaysAMI(cl);
 	    TwowaysAMI.twowaysAMI(derived);
 	    System.out.println("ok");
+
+	    System.out.print("testing batch oneway operations... ");
+	    System.out.flush();
+	    BatchOneways.batchOneways(cl);
+	    BatchOneways.batchOneways(derived);
+	    System.out.println("ok");
 	}
 
         return cl;
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index 2f3fd8a2e77..ccd8f4d1675 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -47,6 +47,13 @@ public class Client
 	    properties.setProperty("Ice.ThreadPool.Client.Size", "2");
 	    properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
 
+	    //
+	    // We must set MessageSizeMax to an explicit values,
+	    // because we run tests to check whether
+	    // Ice.MemoryLimitException is raised as expected.
+	    //
+	    properties.setProperty("Ice.MessageSizeMax", "100");
+
             communicator = Ice.Util.initialize(argsH);
             status = run(argsH.value, communicator);
         }
diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java
index f1ca02f6b97..ae5f1172181 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/Ice/operations/MyDerivedClassI.java
@@ -293,6 +293,11 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         return r;
     }
 
+    public void
+    opByteSOneway(byte[] s, Ice.Current current)
+    {
+    }
+
     public java.util.Map
     opContext(Ice.Current current)
     {
diff --git a/java/test/Ice/operations/Test.ice b/java/test/Ice/operations/Test.ice
index a819ad845a5..c57cb879968 100644
--- a/java/test/Ice/operations/Test.ice
+++ b/java/test/Ice/operations/Test.ice
@@ -145,8 +145,9 @@ dictionary<string, MyEnum> StringMyEnumD;
 
     IntS opIntS(IntS s);
 
-    Ice::Context opContext();
+    void opByteSOneway(ByteS s);
 
+    Ice::Context opContext();
 };
 
 ["ami"] class MyDerivedClass extends MyClass
diff --git a/java/test/Ice/operationsAMD/MyDerivedClassI.java b/java/test/Ice/operationsAMD/MyDerivedClassI.java
index 36f3bd1192b..68a6732f75e 100644
--- a/java/test/Ice/operationsAMD/MyDerivedClassI.java
+++ b/java/test/Ice/operationsAMD/MyDerivedClassI.java
@@ -331,6 +331,12 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public void
+    opByteSOneway_async(Test.AMD_MyClass_opByteSOneway cb, byte[] s, Ice.Current current)
+    {
+        cb.ice_response();
+    }
+
+    public void
     opContext_async(Test.AMD_MyClass_opContext cb, Ice.Current current)
     {
         cb.ice_response(current.ctx);
diff --git a/java/test/Ice/operationsAMD/TestAMD.ice b/java/test/Ice/operationsAMD/TestAMD.ice
index e6f7f4f205d..650fce73cd8 100644
--- a/java/test/Ice/operationsAMD/TestAMD.ice
+++ b/java/test/Ice/operationsAMD/TestAMD.ice
@@ -143,6 +143,8 @@ dictionary<string, MyEnum> StringMyEnumD;
 
     IntS opIntS(IntS s);
 
+    void opByteSOneway(ByteS s);
+
     StringStringD opContext();
 
 };