[jboss-cvs] JBossAS SVN: r114614 - projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager.

[jboss-cvs-commits at lists.jboss.org]

Author: istudens at redhat.com
Date: 2013-12-19 10:22:15 -0500 (Thu, 19 Dec 2013)
New Revision: 114614

Modified:
   projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java
   projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
Log:
JBPAPP-10661 fixing the regression caused by an empty jvmArg

Modified: projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java
===================================================================
--- projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java	2013-12-19 12:38:58 UTC (rev 114613)
+++ projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java	2013-12-19 15:22:15 UTC (rev 114614)
@@ -239,7 +239,8 @@
     */
    public void addArg(Argument arg)
    {
-      arguments.add(arg);
+      if (arg.getValue() != null && arg.getValue().isEmpty() == false)
+         arguments.add(arg);
    }
 
    /**
@@ -280,7 +281,8 @@
     */
    public void addJvmArg(Argument arg)
    {
-      jvmArguments.add(arg);
+      if (arg.getValue() != null && arg.getValue().isEmpty() == false)
+         jvmArguments.add(arg);
    }
 
    /**

Modified: projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
===================================================================
--- projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2013-12-19 12:38:58 UTC (rev 114613)
+++ projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2013-12-19 15:22:15 UTC (rev 114614)
@@ -84,7 +84,7 @@
 
       final ProcessBuilder startCommand = getStartCommand(server, manager);
 
-      System.out.println("Starting server \"" + server.getName() + "\", with command (start timeout is " + manager.getStartupTimeout() + " seconds ): \n" + Arrays.toString(startCommand.command().toArray()));
+      System.out.println("Starting server \"" + server.getName() + "\", with command (start timeout is " + manager.getStartupTimeout() + " seconds ): \n" + commandToString(startCommand.command()));
 
       final File binDir = new File(manager.getJBossHome(), "/bin");
       startCommand.directory(binDir);
@@ -134,6 +134,17 @@
       System.out.println("Server started.") ;
    }
 
+   private static String commandToString(List<String> command)
+   {
+      final StringBuilder commandLine = new StringBuilder();
+      String delim = "";
+      for (String part : command) {
+         commandLine.append(delim).append(part);
+         delim = " ";
+      }
+      return commandLine.toString();
+   }
+
    /** 
     * Delete & create log files
     * @param logFile
@@ -235,7 +246,7 @@
    private static boolean stopServerCli(Server server, ServerManager manager, Writer log) throws IOException, InterruptedException
    {
       ProcessBuilder shutdownCmd = getStopCommand(server, manager);
-      System.out.println("Shutting down server: " + Arrays.toString(shutdownCmd.command().toArray()));
+      System.out.println("Shutting down server: " + commandToString(shutdownCmd.command()));
 
       shutdownCmd.redirectErrorStream(true);
       Process proc = shutdownCmd.start();