Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 56469 invoked from network); 20 May 2005 13:50:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 May 2005 13:50:56 -0000 Received: (qmail 76032 invoked by uid 500); 20 May 2005 13:50:56 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 75993 invoked by uid 500); 20 May 2005 13:50:55 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 75979 invoked by uid 500); 20 May 2005 13:50:55 -0000 Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org Received: (qmail 75961 invoked by uid 99); 20 May 2005 13:50:54 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 20 May 2005 06:50:51 -0700 Received: (qmail 56240 invoked by uid 65534); 20 May 2005 13:50:34 -0000 Message-ID: <20050520135034.56239.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r171118 - /incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java /incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java Date: Fri, 20 May 2005 13:50:33 -0000 To: derby-cvs@incubator.apache.org From: djd@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djd Date: Fri May 20 06:50:32 2005 New Revision: 171118 URL: http://svn.apache.org/viewcvs?rev=3D171118&view=3Drev Log: Cleanup ij code that handles the initial connection opened from properties such as ij.database or ij.dataSource. ij.database clearly now overrides ij.dataSource rather than being somewhat tangled. Allows ij to run in J2ME. Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ut= il.java incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ut= ilMain.java Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools= /ij/util.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/tools/or= g/apache/derby/impl/tools/ij/util.java?rev=3D171118&r1=3D171117&r2=3D171118= &view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ut= il.java (original) +++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ut= il.java Fri May 20 06:50:32 2005 @@ -28,6 +28,7 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; =20 import java.sql.Connection; import java.sql.DriverManager; @@ -408,18 +409,21 @@ if (driver =3D=3D null) { driver =3D "org.apache.derby.jdbc.EmbeddedDriver"; } + =20 + loadDriver(driver); + con =3D DriverManager.getConnection(databaseURL,connInfo); + return con; =20 + } =20 // handle datasource property String dsName =3D System.getProperty("ij.dataSource"); - if (dsName =3D=3D null) { - loadDriver(driver); - con =3D DriverManager.getConnection(databaseURL,connInfo); - return con; + if (dsName =3D=3D null) + return null; =20 - } else { // a datasource // Get a new proxied connection through DataSource Object ds =3D null; // really javax.sql.DataSource try { + =09 Class dc =3D Class.forName(dsName); ds =3D dc.newInstance(); =20 @@ -427,19 +431,20 @@ setupDataSource(ds); =20 // Java method call "by hand" { con =3D ds.getConnection(); } - { java.lang.reflect.Method m =3D dc.getMethod("getConnection", null);=20 - con =3D (java.sql.Connection) m.invoke(ds, new Object[] {}); - } - } catch (Throwable error) { - error.printStackTrace(System.out); + return (java.sql.Connection) m.invoke(ds, new Object[] {}); + } catch (InvocationTargetException ite) + { + if (ite.getTargetException() instanceof SQLException) + throw (SQLException) ite.getTargetException(); + ite.printStackTrace(System.out); + } catch (Exception e) + { + e.printStackTrace(System.out); } - return con; - } // datasource - } - // failed - return null; - } + =09 + return null; + } =20 =20 public static Properties updateConnInfo(String user, String password, Pro= perties connInfo) Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools= /ij/utilMain.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/tools/or= g/apache/derby/impl/tools/ij/utilMain.java?rev=3D171118&r1=3D171117&r2=3D17= 1118&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ut= ilMain.java (original) +++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ut= ilMain.java Fri May 20 06:50:32 2005 @@ -354,7 +354,7 @@ Driver d =3D null; try { d =3D DriverManager.getDriver("jdbc:derby:"); - } catch (Exception e) { + } catch (Throwable e) { d =3D null; } if (d!=3Dnull) { // do we have a driver running? shutdown on exit.