You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2006/07/31 20:06:49 UTC

svn commit: r427190 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java

Author: fuzzylogic
Date: Mon Jul 31 11:06:48 2006
New Revision: 427190

URL: http://svn.apache.org/viewvc?rev=427190&view=rev
Log:
DERBY-1091: Don't prepend a caret to jvmflags in RunSuite if the suite
properties are empty, but the system property is not. Fixes several tests
for J2ME (j9_foundation).

Committed for Myrna Van Lunteren <m....@gmail.com>

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=427190&r1=427189&r2=427190&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java Mon Jul 31 11:06:48 2006
@@ -387,10 +387,17 @@
 		// when the time comes to have this converted into actual jvm flags
 		// the ones given at the command line will overwrite whatever's in the suite
 		String jflags = sp.getProperty("jvmflags");
-		if (jflags != null)
+		if (jvmflags != null)
 		{
-		    jvmflags = jvmflags + "^" + jflags;
-		    suiteProperties.put("jvmflags", jvmflags);
+			if (jflags != null)
+		    		suiteProperties.put("jvmflags", (jvmflags + "^" + jflags));
+			else
+		    		suiteProperties.put("jvmflags", jvmflags);
+		}
+		else
+		{
+			if (jflags != null)
+		    		suiteProperties.put("jvmflags", jflags);
 		}
 		String testflags = sp.getProperty("testJavaFlags");
 		if (testflags != null)