You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/02/21 20:42:06 UTC

svn commit: r510165 - /incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java

Author: mszefler
Date: Wed Feb 21 11:42:05 2007
New Revision: 510165

URL: http://svn.apache.org/viewvc?view=rev&rev=510165
Log:
fixed npe if username not set

Modified:
    incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java

Modified: incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java?view=diff&rev=510165&r1=510164&r2=510165
==============================================================================
--- incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java (original)
+++ incubator/ode/trunk/minerva/src/main/java/org/opentools/minerva/connector/jdbc/JDBCManagedConnectionFactory.java Wed Feb 21 11:42:05 2007
@@ -132,7 +132,7 @@
                 continue;
             }
             JDBCManagedConnection con = (JDBCManagedConnection)unknown;
-            if(con.getUser().equals(user) && con.getURL().equals(url)) {
+            if( (user == null || con.getUser() == null || con.getUser().equals(user)) && con.getURL().equals(url)) {
                 return con;
             }
         }