db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1211257 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
Date Wed, 07 Dec 2011 01:21:25 GMT
Author: dag
Date: Wed Dec  7 01:21:25 2011
New Revision: 1211257

URL: http://svn.apache.org/viewvc?rev=1211257&view=rev
Log:
DERBY-5519 Update code in JVMInfo#derbyVMLevel to give correct results for Java 7 and provisionally
for 8.

Fixed with patch derby-5519.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java?rev=1211257&r1=1211256&r2=1211257&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java Wed Dec
 7 01:21:25 2011
@@ -48,6 +48,7 @@ public abstract class JVMInfo
 		<LI> 5 - J2SE_142 - JDK 1.4.2
 		<LI> 6 - J2SE_15 - JDK 1.5
 		<LI> 7 - J2SE_16 - JDK 1.6
+        <LI> 8 - J2SE_17 - JDK 1.7
 		</UL>
 	*/
 	public static final int JDK_ID;
@@ -174,7 +175,8 @@ public abstract class JVMInfo
 		case J2SE_14: return J2ME ? "J2ME - JDBC for CDC/FP 1.1" : "J2SE 1.4 - JDBC 3.0";
 		case J2SE_142: return "J2SE 1.4.2 - JDBC 3.0";
 		case J2SE_15: return "J2SE 5.0 - JDBC 3.0";
-		case J2SE_16: return "Java SE 6 - JDBC 4.0";
+        case J2SE_16: return "Java SE 6 - JDBC 4.1";
+        case J2SE_17: return "Java SE 7 - JDBC 4.1";
 		default: return "?-?";
 		}
 	}



Mime
View raw message