You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2001/11/27 11:28:16 UTC

cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/driver AvalonDBDriver.java

hammant     01/11/27 02:28:16

  Modified:    apps/db/src/java/org/apache/avalon/db/driver
                        AvalonDBDriver.java
  Log:
  instantiation corrections
  
  Revision  Changes    Path
  1.11      +16 -8     jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/driver/AvalonDBDriver.java
  
  Index: AvalonDBDriver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/driver/AvalonDBDriver.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AvalonDBDriver.java	2001/11/14 03:26:06	1.10
  +++ AvalonDBDriver.java	2001/11/27 10:28:16	1.11
  @@ -29,7 +29,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class
           AvalonDBDriver extends AbstractDriver implements Driver {
  @@ -77,21 +77,29 @@
   
   
   
  -        String connectionClass = null;
  +        String connectionClass1 = null;
  +        String connectionClass2 = null;
           if (words[2].equals("cmds")) {
  -            connectionClass = "org.apache.avalon.db.transport.cmdstream.client.CommandConnection";
  +            connectionClass1 = "org.apache.avalon.db.transport.cmdstream.client.";
  +            connectionClass2 = "CommandConnection";
           } else if (words[2].equals("glue")) {
  -            connectionClass = "org.apache.avalon.db.transport.cmdstream.client.GlueConnection";
  +            connectionClass1 = "org.apache.avalon.db.transport.cmdstream.client.";
  +            connectionClass2 = "GlueConnection";
           }
           AvalonDBConnection connection = null;
           try {
  -            connection = (AvalonDBConnection) Class.forName(connectionClass).newInstance();
  -        } catch (ClassNotFoundException cnfe) {
  +            try {
  +              connection = (AvalonDBConnection) Class.forName(connectionClass1 + "jdbc30.JDBC30" + connectionClass2).newInstance();
  +            } catch (ClassNotFoundException cnfe) {
  +              connection = (AvalonDBConnection) Class.forName(connectionClass1 + "jdbc2x.JDBC2x" + connectionClass2).newInstance();
  +            }
  +        } catch (ClassNotFoundException cnfe2) {
               throw new SQLException("JDBC Driver Class not found, check jars(s) in classpath");
           } catch (InstantiationException ie) {
  -            throw new SQLException("Some problem instantiating JDBC driver");
  +            ie.printStackTrace();
  +            throw new SQLException("Some problem instantiating JDBC driver: " + ie.getMessage());
           } catch (IllegalAccessException iae) {
  -            throw new SQLException("Some problem accessing JDBC driver");
  +            throw new SQLException("Some problem accessing JDBC driver: " + iae.getMessage());
           }
           connection.initialize(words[5], new Integer(words[6]).intValue(), url, options);
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>