Author: remm Date: Tue Mar 6 21:14:17 2018 New Revision: 1826048 URL: http://svn.apache.org/viewvc?rev=1826048&view=rev Log: Revert 62160 following veto.
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1826048&r1=1826047&r2=1826048&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Mar 6 21:14:17 2018 @@ -1924,14 +1924,10 @@ public class Digester extends DefaultHan for (int i = 0; i < nAttributes; ++i) { String value = newAttrs.getValue(i); try { - String newValue = value; - do { - value = newValue; - newValue = IntrospectionUtils.replaceProperties(value, null, source); - if (!value.equals(newValue)) { - newAttrs.setValue(i, newValue); - } - } while (!value.equals(newValue)); + String newValue = IntrospectionUtils.replaceProperties(value, null, source); + if (value != newValue) { + newAttrs.setValue(i, newValue); + } } catch (Exception e) { log.warn(sm.getString("digester.failedToUpdateAttributes", newAttrs.getLocalName(i), value), e); } @@ -1949,17 +1945,14 @@ public class Digester extends DefaultHan */ private StringBuilder updateBodyText(StringBuilder bodyText) { String in = bodyText.toString(); - String out = in; + String out; try { - do { - in = out; - out = IntrospectionUtils.replaceProperties(in, null, source); - } while (!out.equals(in)); + out = IntrospectionUtils.replaceProperties(in, null, source); } catch (Exception e) { return bodyText; // return unchanged data } - if (out.equals(in)) { + if (out == in) { // No substitutions required. Don't waste memory creating // a new buffer return bodyText; Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1826048&r1=1826047&r2=1826048&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 6 21:14:17 2018 @@ -59,10 +59,6 @@ <fix> Avoid potential loop in APR/Native poller. (markt) </fix> - <update> - <bug>62160</bug>: Allow more flexible linked property replacement - using the configured property source and system properties. (remm) - </update> </changelog> </subsection> <subsection name="Other"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org