db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r600460 - /db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java
Date Mon, 03 Dec 2007 09:45:45 GMT
Author: dyre
Date: Mon Dec  3 01:45:44 2007
New Revision: 600460

URL: http://svn.apache.org/viewvc?rev=600460&view=rev
Log:
DERBY-2815: ij doesn't start with J2ME / JSR169 / weme6.1
Patch file: DERBY-2815.diff2
Patch contributed by Myrna Van Lunteren

Modified:
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java?rev=600460&r1=600459&r2=600460&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java Mon Dec  3 01:45:44
2007
@@ -467,12 +467,12 @@
         driverName = util.getSystemProperty("driver");
         if (driverName == null) driverName = util.getSystemProperty("ij.driver");
 	if (driverName == null || driverName.length()==0) driverName = defaultDriver;
-        if (driverName != null) {
+        if (driverName != null && IS_AT_LEAST_JDBC2) {
 	    util.loadDriver(driverName);
 	}
 
 	String jdbcProtocol = util.getSystemProperty("ij.protocol");
-	if (jdbcProtocol != null)
+	if (jdbcProtocol != null && IS_AT_LEAST_JDBC2)
 	    util.loadDriverIfKnown(jdbcProtocol);
 	
     String user = util.getSystemProperty("ij.user");
@@ -482,7 +482,7 @@
 	databaseURL = util.getSystemProperty("database");
 	if (databaseURL == null) databaseURL = util.getSystemProperty("ij.database");
 	if (databaseURL == null || databaseURL.length()==0) databaseURL = defaultURL;
-	if (databaseURL != null) {
+	if (databaseURL != null && IS_AT_LEAST_JDBC2) {
 	    // add protocol if might help find driver.
 		// if have full URL, load driver for it
 		if (databaseURL.startsWith("jdbc:"))



Mime
View raw message