diff options
author | Matthew Newhook <matthew@zeroc.com> | 2014-09-03 11:01:11 -0230 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2014-09-03 11:01:11 -0230 |
commit | 3b0588532354adf7bf3b86e611a8ae4996bfe6ad (patch) | |
tree | 253961cb83af7bc3b1dfc7633a8f934789476cd1 /java/test/Ice/operations/Collocated.java | |
parent | More work on ICE-2400: the send log thread now uses a separate communicator t... (diff) | |
download | ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.tar.bz2 ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.tar.xz ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.zip |
- C#, Java: Removed Outgoing, fixed generated code to make synchronous
requests using AMI.
- Java: AsyncResult is now an interface.
- Added --arg to allTests.py.
- Fixed operations, adapterDeactivation and metrics test to work with
background IO.
- Added Collocated interrupt test.
- Added support for batch oneway requests using AMI.
- Added test in operations for batch oneway requests using AMI.
Diffstat (limited to 'java/test/Ice/operations/Collocated.java')
-rw-r--r-- | java/test/Ice/operations/Collocated.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java index c34d07d5f11..278e81a9b65 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/Ice/operations/Collocated.java @@ -35,6 +35,10 @@ public class Collocated extends test.Util.Application { Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); + if(initData.properties.getPropertyAsInt("Ice.BackgroundIO") > 0) + { + initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2"); + } initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations"); // |