[cvs] expresso commit by rauld: Null pointer exception fixed on parentPool

JCorporate Ltd jcorp at jcorporate.com
Mon Jan 17 15:15:22 UTC 2005


Log Message:
-----------
Null pointer exception fixed on parentPool use. Contributed by Yves Henri Amaizo

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db:
        DBConnection.java

Revision Data
-------------
Index: DBConnection.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java -u -r1.57 -r1.58
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java
@@ -772,11 +772,13 @@
         createdTime = System.currentTimeMillis();
         myLogin = myJdbc.getLogin().trim();
         myPassword = myJdbc.getPassword().trim();
-        if (parentPool.getJNDIConfig(myJdbc) == null) {
+        if (parentPool != null) {
+          if (parentPool.getJNDIConfig(myJdbc) == null) {
             String myName = (THIS_CLASS + "connect(JndiDataSource)");
-            throw new DBException(myName + " JNDI info configure for datasource");
+            throw new DBException(myName +
+                                  " JNDI info configure for datasource");
+          }
         }
-
         if (dbConnectFormat == null) {
             String myName = (THIS_CLASS + "connect(JndiDataSource)");
             throw new DBException(myName +


More information about the cvs mailing list