geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r372351 - /geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Date Wed, 25 Jan 2006 22:51:23 GMT
Author: ammulder
Date: Wed Jan 25 14:51:21 2006
New Revision: 372351

URL: http://svn.apache.org/viewcvs?rev=372351&view=rev
Log:
Added workaround for GERONIMO-1421 (manually escape ; in JDBC URL)

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=372351&r1=372350&r2=372351&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
Wed Jan 25 14:51:21 2006
@@ -1149,7 +1149,11 @@
             password = request.getParameter("password");
             if(password != null && password.equals("")) password = null;
             url = request.getParameter("url");
-            if(url != null && url.equals("")) url = null;
+            if(url != null && url.equals("")) {
+                url = null;
+            } else if(url != null && url.indexOf("%3B") > -1) {
+                url = url.replaceAll("%3B", ";"); // attempt to work around Pluto/Tomcat
error with ; in a stored value
+            }
             urlPrototype = request.getParameter("urlPrototype");
             if(urlPrototype != null && urlPrototype.equals("")) urlPrototype = null;
             jar1 = request.getParameter("jar1");
@@ -1227,7 +1231,9 @@
             if(driverClass != null) response.setRenderParameter("driverClass", driverClass);
             if(user != null) response.setRenderParameter("user", user);
             if(password != null) response.setRenderParameter("password", password);
-            if(url != null) response.setRenderParameter("url", url);
+            if(url != null) { // attempt to work around Pluto/Tomcat error with ; in a stored
value
+                response.setRenderParameter("url", url.replaceAll(";", "%3B"));
+            }
             if(urlPrototype != null) response.setRenderParameter("urlPrototype", urlPrototype);
             if(jar1 != null) response.setRenderParameter("jar1", jar1);
             if(jar2 != null) response.setRenderParameter("jar2", jar2);



Mime
View raw message