geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r678402 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java
Date Mon, 21 Jul 2008 12:39:15 GMT
Author: mcconne
Date: Mon Jul 21 05:39:14 2008
New Revision: 678402

URL: http://svn.apache.org/viewvc?rev=678402&view=rev
Log:
GERONIMODEVTOOLS-208 Append default value with changes -- Thanks to Kan and BJ for these patches

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java?rev=678402&r1=678401&r2=678402&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java
Mon Jul 21 05:39:14 2008
@@ -68,6 +68,11 @@
 
     @Override
     public String getVMArgs() {
+        String superVMArgs = super.getVMArgs();
+        if (superVMArgs != null && superVMArgs.trim().length() > 0) {
+            return superVMArgs;
+        }
+
         String runtimeLocation = getServer().getRuntime().getLocation().toString();
         GeronimoRuntimeDelegate geronimoRuntimeDelegate = (GeronimoRuntimeDelegate) getServer().getRuntime().getAdapter(GeronimoRuntimeDelegate.class);
         if (geronimoRuntimeDelegate == null) {
@@ -105,14 +110,7 @@
         //-Dorg.apache.geronimo.base.dir="GERONIMO_BASE"
         String baseDir = "-Dorg.apache.geronimo.base.dir=" + runtimeLocation;
 
-        String vmArgs = javaagent + " " + javaExtDirs + " " + javaEndorsedDirs;
-
-        String superVMArgs = super.getVMArgs();
-        if (superVMArgs != null) {
-            vmArgs += " " + superVMArgs;
-        }
-
-        return vmArgs;
+        return javaagent + " " + javaExtDirs + " " + javaEndorsedDirs;
     }
 
     /*



Mime
View raw message