[sling-org-apache-sling-scripting-jsp] 02/04: Revert "Strings and Boxed types should be compared using "equals()""

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git

commit d514c1f5a4c7ecd98ff8570ab33f1185d6912101
Author: Haris Adzemovic <adzemovic.ha...@gmail.com>
AuthorDate: Tue Nov 12 09:54:44 2019 +0100

    Revert "Strings and Boxed types should be compared using "equals()""
    
    This reverts commit 1de1ddb29ae966f8d503538d95048a517bef4dcf.
    
    Lines should be marked with NOSONAR instead after PR discussion
---
 .../sling/scripting/jsp/jasper/compiler/TagFileProcessor.java  |  4 ++--
 .../scripting/jsp/jasper/xmlparser/XMLEncodingDetector.java    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
 
b/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
index ba8ad44..57f3d4b 100644
--- 
a/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
+++ 
b/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java
@@ -445,10 +445,10 @@ class TagFileProcessor {
         private void checkUniqueName(String name, String type, Node n,
                 TagAttributeInfo attr) throws JasperException {
 
-            HashMap table = (type.equals(VAR_NAME_FROM)) ? nameFromTable : 
nameTable;
+            HashMap table = (type == VAR_NAME_FROM) ? nameFromTable : 
nameTable;
             NameEntry nameEntry = (NameEntry) table.get(name);
             if (nameEntry != null) {
-                if (!type.equals(TAG_DYNAMIC) || 
!nameEntry.getType().equals(TAG_DYNAMIC)) {
+                if (type != TAG_DYNAMIC || nameEntry.getType() != TAG_DYNAMIC) 
{
                     int line = nameEntry.getNode().getStart().getLineNumber();
                     err.jspError(n, "jsp.error.tagfile.nameNotUnique", type,
                             nameEntry.getType(), Integer.toString(line));
diff --git 
a/src/main/java/org/apache/sling/scripting/jsp/jasper/xmlparser/XMLEncodingDetector.java
 
b/src/main/java/org/apache/sling/scripting/jsp/jasper/xmlparser/XMLEncodingDetector.java
index 9fc0b42..07524be 100644
--- 
a/src/main/java/org/apache/sling/scripting/jsp/jasper/xmlparser/XMLEncodingDetector.java
+++ 
b/src/main/java/org/apache/sling/scripting/jsp/jasper/xmlparser/XMLEncodingDetector.java
@@ -1327,7 +1327,7 @@ public class XMLEncodingDetector {
             String name = scanPseudoAttribute(scanningTextDecl, fString);
             switch (state) {
                 case STATE_VERSION: {
-                    if (name.equals(fVersionSymbol)) {
+                    if (name == fVersionSymbol) {
                         if (!sawSpace) {
                             reportFatalError(scanningTextDecl
                                        ? 
"jsp.error.xml.spaceRequiredBeforeVersionInTextDecl"
@@ -1343,7 +1343,7 @@ public class XMLEncodingDetector {
                             err.jspError("jsp.error.xml.versionNotSupported",
                                         version);
                         }
-                    } else if (name.equals(fEncodingSymbol)) {
+                    } else if (name == fEncodingSymbol) {
                         if (!scanningTextDecl) {
                             err.jspError("jsp.error.xml.versionInfoRequired");
                         }
@@ -1366,7 +1366,7 @@ public class XMLEncodingDetector {
                     break;
                 }
                 case STATE_ENCODING: {
-                    if (name.equals(fEncodingSymbol)) {
+                    if (name == fEncodingSymbol) {
                         if (!sawSpace) {
                             reportFatalError(scanningTextDecl
                                       ? 
"jsp.error.xml.spaceRequiredBeforeEncodingInTextDecl"
@@ -1377,7 +1377,7 @@ public class XMLEncodingDetector {
                         state = scanningTextDecl ? STATE_DONE : 
STATE_STANDALONE;
                         // TODO: check encoding name; set encoding on
                         //       entity scanner
-                    } else if (!scanningTextDecl && 
name.equals(fStandaloneSymbol)) {
+                    } else if (!scanningTextDecl && name == fStandaloneSymbol) 
{
                         if (!sawSpace) {
                             
err.jspError("jsp.error.xml.spaceRequiredBeforeStandalone");
                         }
@@ -1392,7 +1392,7 @@ public class XMLEncodingDetector {
                     break;
                 }
                 case STATE_STANDALONE: {
-                    if (name.equals(fStandaloneSymbol)) {
+                    if (name == fStandaloneSymbol) {
                         if (!sawSpace) {
                             
err.jspError("jsp.error.xml.spaceRequiredBeforeStandalone");
                         }