db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mka...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer ConnectionFactoryAbstractImpl.java
Date Wed, 16 Mar 2005 17:47:19 GMT
mkalen      2005/03/16 09:47:19

  Modified:    src/java/org/apache/ojb/broker/accesslayer Tag:
                        OJB_1_0_RELEASE ConnectionFactoryAbstractImpl.java
  Log:
  Some minor spelling corrections.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.10.2.2  +8 -6      db-ojb/src/java/org/apache/ojb/broker/accesslayer/ConnectionFactoryAbstractImpl.java
  
  Index: ConnectionFactoryAbstractImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/ConnectionFactoryAbstractImpl.java,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- ConnectionFactoryAbstractImpl.java	7 Jan 2005 23:00:34 -0000	1.10.2.1
  +++ ConnectionFactoryAbstractImpl.java	16 Mar 2005 17:47:19 -0000	1.10.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.accesslayer;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -121,16 +121,17 @@
               {
                   if (conn == null || conn.isClosed())
                   {
  -                    log.error("Connection for JdbcConnectionDiscriptor (" +
  +                    log.error("Connection for JdbcConnectionDescriptor (" +
                               (jcd.getDatasourceName() != null ? "datasource: " + jcd.getDatasourceName()
:
                               "db-url: " + getDbURL(jcd) + ", user: " + jcd.getUserName())
+
  -                            ") was not valid, either *closed* or *null*");
  +                            ") is invalid: " +
  +                            (conn != null ? "*closed*" : "*null*"));
                       throw new LookupException("Could not lookup valid connection from pool/DB,
connection was "+conn);
                   }
               }
               catch (SQLException e)
               {
  -                log.error("Error during sanity check of new DB Connection, either it was
closed", e);
  +                log.error("Error during sanity check of new DB Connection", e);
                   throw new LookupException("Connection check failed", e);
               }
           }
  @@ -161,7 +162,7 @@
       }
   
       /**
  -     * Override this method to do cleanup in your implenetation.
  +     * Override this method to do cleanup in your implementation.
        * Do a <tt>super.releaseAllResources()</tt> in your method implementation
        * to free resources used by this class.
        */
  @@ -292,4 +293,5 @@
           return jcd.isDataSource() ? jcd.getDatasourceName() :
                   jcd.getProtocol() + ":" + jcd.getSubProtocol() + ":" + jcd.getDbAlias();
       }
  +
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message