Fix TestController to pass extra arguments to run.py

1 files changed, 12 insertions, 1 deletions

diff --git a/java/test/controller/src/main/java/Test/Common/ControllerServer.java b/java/test/controller/src/main/java/Test/Common/ControllerServer.java
index ecef7efdeba..d5ffbd32dee 100644
--- a/java/test/controller/src/main/java/Test/Common/ControllerServer.java
+++ b/java/test/controller/src/main/java/Test/Common/ControllerServer.java
@@ -152,6 +152,11 @@ public class ControllerServer extends Ice.Application
     
     public class ControllerI extends _ControllerDisp
     {
+        public ControllerI(String[] args)
+        {
+            _args = args;
+        }
+
         @Override
         public ServerPrx runServer(String lang, final String name, String protocol, String host, 
                                    boolean winrt, String[] options, Ice.Current current)
@@ -188,6 +193,11 @@ public class ControllerServer extends Ice.Application
                 args.add("--arg");
                 args.add(option);
             }
+
+            for(String a : _args)
+            {
+                args.add(a);
+            }
             
             try
             {
@@ -208,6 +218,7 @@ public class ControllerServer extends Ice.Application
         }
         
         private ServerPrx _server;
+        private String[] _args;
     }
     
     @Override
@@ -215,7 +226,7 @@ public class ControllerServer extends Ice.Application
     run(String[] args)
     {
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControllerAdapter");
-        adapter.add(new ControllerI(), communicator().stringToIdentity("controller"));
+        adapter.add(new ControllerI(args), communicator().stringToIdentity("controller"));
         adapter.activate();
         communicator().waitForShutdown();
         return 0;