tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r711500 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/IntrospectionUtils.java webapps/docs/changelog.xml
Date Wed, 05 Nov 2008 03:17:08 GMT
Author: markt
Date: Tue Nov  4 19:17:08 2008
New Revision: 711500

URL: http://svn.apache.org/viewvc?rev=711500&view=rev
Log:
* Fix String comparison bugs found by Find Bugs using Remy's alternative solution

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=711500&r1=711499&r2=711500&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  4 19:17:08 2008
@@ -187,11 +187,6 @@
   +1: fhanik, pero
   -1: 
 
-* Fix String comparison bugs found by Find Bugs using Remy's alternative solution
-  http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?r1=708185&r2=708184&pathrev=708185
-  +1: markt, fhanik, remm
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46096
   Support annotation processing whilst running under a security manager
   http://people.apache.org/~markt/patches/2008-10-27-bug46096.patch

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=711500&r1=711499&r2=711500&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Tue Nov  4 19:17:08
2008
@@ -489,6 +489,9 @@
      */
     public static String replaceProperties(String value, Hashtable staticProp,
             PropertySource dynamicProp[]) {
+        if (value.indexOf("$") < 0) {
+            return value;
+        }
         StringBuffer sb = new StringBuffer();
         int prev = 0;
         // assert value!=nil

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=711500&r1=711499&r2=711500&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Nov  4 19:17:08 2008
@@ -129,6 +129,10 @@
         Fix some thread safety issues in date formatting. (markt)
       </fix>
       <fix>
+        Fix a String comparison bug in the digester property replacement that
+        resulted in non-optimal operation. (markt)
+      </fix>
+      <fix>
         Correct handle multi-level contexts defined using context.xml files.
         (markt)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message