[jboss-cvs] JBossAS SVN: r114618 - 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-20 02:25:30 -0500 (Fri, 20 Dec 2013)
New Revision: 114618

Modified:
   projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java
Log:
JBPAPP-10661 moving the condition to a better place, it was always null there

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-20 05:34:12 UTC (rev 114617)
+++ projects/server-manager/branches/1.0.2.GA_CP/src/main/java/org/jboss/jbossas/servermanager/Server.java	2013-12-20 07:25:30 UTC (rev 114618)
@@ -239,8 +239,7 @@
     */
    public void addArg(Argument arg)
    {
-      if (arg.getValue() != null && arg.getValue().isEmpty() == false)
-         arguments.add(arg);
+      arguments.add(arg);
    }
 
    /**
@@ -253,7 +252,8 @@
       final List<String> args = new ArrayList<String>();
       for (Argument argument : arguments)
       {
-         args.add(argument.getValue());
+         if (argument.getValue() != null && argument.getValue().isEmpty() == false)
+            args.add(argument.getValue());
       }
       return args;
    }
@@ -281,8 +281,7 @@
     */
    public void addJvmArg(Argument arg)
    {
-      if (arg.getValue() != null && arg.getValue().isEmpty() == false)
-         jvmArguments.add(arg);
+      jvmArguments.add(arg);
    }
 
    /**
@@ -295,7 +294,8 @@
       final List<String> args = new ArrayList<String>();
       for (Argument argument : jvmArguments)
       {
-         args.add(argument.getValue());
+         if (argument.getValue() != null && argument.getValue().isEmpty() == false)
+            args.add(argument.getValue());
       }
       return args;
    }