Fix string comp bugs reported by Find Bugs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@699646 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/digester/Digester.java b/java/org/apache/tomcat/util/digester/Digester.java
index 13371dd..bfabd62 100644 (file)
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -2866,7 +2866,7 @@ public class Digester extends DefaultHandler {
             try {
                 String newValue = 
                     IntrospectionUtils.replaceProperties(value, null, source);
-                if (value != newValue) {
+                if (!value.equals(newValue)) {
                     newAttrs.setValue(i, newValue);
                 }
             }
@@ -2894,7 +2894,7 @@ public class Digester extends DefaultHandler {
             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;