geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r357487 - /geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Date Sun, 18 Dec 2005 18:14:40 GMT
Author: ammulder
Date: Sun Dec 18 10:14:37 2005
New Revision: 357487

URL: http://svn.apache.org/viewcvs?rev=357487&view=rev
Log:
Missed this file in the last commit (avoid NPE in portlet, GERONIMO-1382)

Modified:
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=357487&r1=357486&r2=357487&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Sun Dec 18 10:14:37 2005
@@ -786,8 +786,12 @@
         Driver driver = (Driver) driverClass.newInstance();
         if(driver.acceptsURL(data.url)) {
             Properties props = new Properties();
-            props.put("user", data.user);
-            props.put("password", data.password);
+            if(data.user != null) {
+                props.put("user", data.user);
+            }
+            if(data.password != null) {
+                props.put("password", data.password);
+            }
             Connection con = null;
             try {
                 con = driver.connect(data.url, props);



Mime
View raw message