tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r699646 - /tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Date Sat, 27 Sep 2008 13:45:28 GMT
Author: markt
Date: Sat Sep 27 06:45:27 2008
New Revision: 699646

URL: http://svn.apache.org/viewvc?rev=699646&view=rev
Log:
Fix string comp bugs reported by Find Bugs

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java

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=699646&r1=699645&r2=699646&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Sat Sep 27 06:45:27 2008
@@ -2866,7 +2866,7 @@
             try {
                 String newValue = 
                     IntrospectionUtils.replaceProperties(value, null, source);
-                if (value != newValue) {
+                if (!value.equals(newValue)) {
                     newAttrs.setValue(i, newValue);
                 }
             }
@@ -2894,7 +2894,7 @@
             return bodyText; // return unchanged data
         }
 
-        if (out == in)  {
+        if (out.equals(in))  {
             // No substitutions required. Don't waste memory creating
             // a new buffer
             return bodyText;



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


Mime
View raw message