diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-06-08 21:46:16 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-06-08 21:46:16 +0000 |
| commit | 30e49a08e55e415acfcdf093c2dc8c695ead3078 (patch) | |
| tree | 32942e572d7dd09298a4c5a907bc5d4d95f55476 /java/test/Ice/operations/Collocated.java | |
| parent | Better handling of multiples argc/argv calls (diff) | |
| download | ice-30e49a08e55e415acfcdf093c2dc8c695ead3078.tar.bz2 ice-30e49a08e55e415acfcdf093c2dc8c695ead3078.tar.xz ice-30e49a08e55e415acfcdf093c2dc8c695ead3078.zip | |
Fix for bugs #542 and #1015 (default properties)
Diffstat (limited to 'java/test/Ice/operations/Collocated.java')
| -rw-r--r-- | java/test/Ice/operations/Collocated.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java index b9e984dc00d..37370eaac76 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/Ice/operations/Collocated.java @@ -10,7 +10,7 @@ public class Collocated { private static int - run(String[] args, Ice.Communicator communicator) + run(String[] args, Ice.Communicator communicator, Ice.InitializationData initData) { communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); @@ -19,7 +19,7 @@ public class Collocated adapter.add(new TestCheckedCastI(), communicator.stringToIdentity("context")); adapter.activate(); - AllTests.allTests(communicator, true); + AllTests.allTests(communicator, initData, true); return 0; } @@ -32,8 +32,11 @@ public class Collocated try { - communicator = Ice.Util.initialize(args); - status = run(args, communicator); + Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args); + Ice.InitializationData initData = new Ice.InitializationData(); + initData.properties = Ice.Util.createProperties(argsH); + communicator = Ice.Util.initialize(argsH, initData); + status = run(args, communicator, initData); } catch(Ice.LocalException ex) { |