geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r539995 - /geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Date Mon, 21 May 2007 02:16:13 GMT
Author: dwoods
Date: Sun May 20 19:16:12 2007
New Revision: 539995

URL: http://svn.apache.org/viewvc?view=rev&rev=539995
Log:
GERONIMO-3103 GBeanOverride.writeXml parseException

Modified:
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java?view=diff&rev=539995&r1=539994&r2=539995
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Sun May 20 19:16:12 2007
@@ -513,6 +513,13 @@
                         DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
                         DocumentBuilder builder = factory.newDocumentBuilder();
 
+                        /**
+                         * if there was a value such as jdbc url with & then when
that value was oulled
+                         * from the config.xml the & would have been replaced/converted
to '&', we need to check
+                         * and change it back because an & would create a parse exception.
+                         */
+                        value = value.replaceAll("&(?!amp;)", "&");
+
 //                        String unsubstitutedValue = unsubstitutedAttributes.get(name);
 //                        if (unsubstitutedValue != null) {
 //                            log.debug("writeXML attribute " + name



Mime
View raw message