You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/12/18 19:14:40 UTC
svn commit: r357487 -
/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
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);