db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1220671 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/services/monitor/ engine/org/apache/derby/jdbc/ testing/org/apache/derbyTesting/functionTests/util/corruptio/
Date Mon, 19 Dec 2011 09:33:00 GMT
Author: kahatlen
Date: Mon Dec 19 09:33:00 2011
New Revision: 1220671

URL: http://svn.apache.org/viewvc?rev=1220671&view=rev
Log:
DERBY-5542: Remove checks for Java version being greater than or equal to 1.4

No older versions are supported.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=1220671&r1=1220670&r2=1220671&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
Mon Dec 19 09:33:00 2011
@@ -1648,7 +1648,7 @@ nextModule:
     private static final HashMap storageFactories = new HashMap();
     static {
 		String dirStorageFactoryClass;
-		if( !JVMInfo.J2ME && (JVMInfo.JDK_ID >= JVMInfo.J2SE_14) )
+        if (!JVMInfo.J2ME)
             dirStorageFactoryClass = "org.apache.derby.impl.io.DirStorageFactory4";
         else
             dirStorageFactoryClass = "org.apache.derby.impl.io.DirStorageFactory";

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java?rev=1220671&r1=1220670&r2=1220671&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java Mon Dec 19
09:33:00 2011
@@ -36,7 +36,6 @@ import org.apache.derby.iapi.jdbc.Resour
 import org.apache.derby.iapi.reference.SQLState;
 import org.apache.derby.iapi.services.context.ContextManager;
 import org.apache.derby.iapi.services.context.ContextService;
-import org.apache.derby.iapi.services.info.JVMInfo;
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
 import org.apache.derby.iapi.store.access.TransactionController;
 import org.apache.derby.iapi.store.access.XATransactionController;
@@ -827,8 +826,7 @@ class EmbedXAResource implements XAResou
         
         xae = new XAException(message);
         xae.errorCode = xaErrorCode;
-        if (JVMInfo.JDK_ID >= JVMInfo.J2SE_14)
-            xae.initCause(se);
+        xae.initCause(se);
         return xae;
     }
 	

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java?rev=1220671&r1=1220670&r2=1220671&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
Mon Dec 19 09:33:00 2011
@@ -68,17 +68,8 @@ public class CorruptDiskStorageFactory e
 	 */
 	WritableStorageFactory getRealStorageFactory()
 	{
-		String dirStorageFactoryClass;
-		if( JVMInfo.JDK_ID >= JVMInfo.J2SE_14)
-        {
-            dirStorageFactoryClass = 
+		String dirStorageFactoryClass =
                 "org.apache.derby.impl.io.DirStorageFactory4";
-        }
-        else
-        {
-            dirStorageFactoryClass = 
-                "org.apache.derby.impl.io.DirStorageFactory";
-        }
 		
 		WritableStorageFactory storageFactory = null;
 		try{



Mime
View raw message