db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r427193 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
Date Mon, 31 Jul 2006 18:33:54 GMT
Author: fuzzylogic
Date: Mon Jul 31 11:33:53 2006
New Revision: 427193

URL: http://svn.apache.org/viewvc?rev=427193&view=rev
Log:
DERBY-1605: To determine whether or not JVM has JDBC4, compare with 
java.specification.version, not java.vm.version.

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

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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=427193&r1=427192&r2=427193&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
Mon Jul 31 11:33:53 2006
@@ -255,8 +255,8 @@
             System.setProperties(sp);
         }
         
-        JavaVersionHolder	jvh = getProperties(sp);
-		boolean				isJDBC4 = jvh.atLeast( 1, 6 );
+        JavaVersionHolder	jvhs = getProperties(sp);
+		boolean				isJDBC4 = jvhs.atLeast( 1, 6 );
 
         // Setup the directories for the test and test output
         setDirectories(scriptName,sp);
@@ -1029,7 +1029,12 @@
   		    jvmName = "jdk" + majorVersion + minorVersion;
             }
         }
-		
+
+        // create a JavaVersionHolder for the java.specification.version - 
+        // used to control Sed-ing for JDBC4 & up
+        String specversion = (sp.getProperty("java.specification.version"));
+        JavaVersionHolder jvhs = new JavaVersionHolder(specversion);
+
         testEncoding = sp.getProperty("derbyTesting.encoding");
         upgradejarpath = sp.getProperty("derbyTesting.jar.path");
         if ((testEncoding != null) && (!jvmName.equals("jdk15")))
@@ -1285,7 +1290,7 @@
 		if (uscdb != null && uscdb.equals("true"))
 			useCommonDB = true;
 
-		return jvh;
+		return jvhs;
     }
 
     private static String createPropString()



Mime
View raw message