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 rh...@apache.org on 2011/11/04 14:42:17 UTC

svn commit: r1197563 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java

Author: rhillegas
Date: Fri Nov  4 13:42:17 2011
New Revision: 1197563

URL: http://svn.apache.org/viewvc?rev=1197563&view=rev
Log:
DERBY-5490: Fix the spawning of network servers on the OpenJDK 7 preview on Mac OS X.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1197563&r1=1197562&r2=1197563&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Fri Nov  4 13:42:17 2011
@@ -593,6 +593,16 @@ public abstract class BaseTestCase
                     File.separator + "java";
             }
         }
+
+        // derby-5490. workaround problem if executable name contains spaces
+        if ( vmname.contains( " " ) )
+        {
+            if ( getSystemProperty( "os.name" ).equals( "Mac OS X" ) )
+            {
+                vmname = "java";
+            }
+        }
+        
         return vmname;
     }