apache · martin-g · Sep 15, 2020 · Sep 10, 2020
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
@@ -149,7 +149,7 @@ public void setUnless(String c) {
      * @return true if there is no if condition, or the named property exists
      */
     protected boolean testIfCondition() {
-        if (ifCondition == null || "".equals(ifCondition)) {
+        if (ifCondition == null || ifCondition.isEmpty()) {
             return true;
         }
         return getProject().getProperty(ifCondition) != null;

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -154,7 +154,7 @@ protected void jmxCreate(MBeanServerConnection jmxServerConnection,
                }
            }
         }
-        if (classLoader != null && !"".equals(classLoader)) {
+        if (classLoader != null && !classLoader.isEmpty()) {
             if (isEcho()) {
                 handleOutput("create MBean " + name + " from class "
                         + className + " with classLoader " + classLoader);

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -254,7 +254,7 @@ public void setPort(String port) {
      * @return Returns the useRef.
      */
     public boolean isUseRef() {
-        return ref != null && !"".equals(ref);
+        return ref != null && !ref.isEmpty();
     }
 
     /**

diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1196,7 +1196,7 @@ public void declareRoles(String... roleNames) {
         }
 
         for (String role : roleNames) {
-            if (role == null || "".equals(role)) {
+            if (role == null || role.isEmpty()) {
                 throw new IllegalArgumentException(
                         sm.getString("applicationContext.role.iae",
                                 getContextPath()));

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
@@ -2136,7 +2136,7 @@ public void setPath(String path) {
         if (path == null || path.equals("/")) {
             invalid = true;
             this.path = "";
-        } else if ("".equals(path) || path.startsWith("/")) {
+        } else if (path.isEmpty() || path.startsWith("/")) {
             this.path = path;
         } else {
             invalid = true;

diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java
@@ -485,7 +485,7 @@ public void containerEvent(ContainerEvent event) {
             if (disabled) return;
             if (Container.ADD_CHILD_EVENT.equals(event.getType())) {
                 Context context = (Context) event.getData();
-                if ("".equals(context.getPath())) {
+                if (context.getPath().isEmpty()) {
                     // Force re-calculation and disable listener since it won't
                     // be re-used
                     engine.defaultAccessLog.set(null);

diff --git a/java/org/apache/catalina/filters/WebdavFixFilter.java b/java/org/apache/catalina/filters/WebdavFixFilter.java
@@ -100,7 +100,7 @@ public void doFilter(ServletRequest request, ServletResponse response,
             httpResponse.sendRedirect(buildRedirect(httpRequest));
         } else if (ua.startsWith(UA_MINIDIR_5_2_3790)) {
             // XP 64-bit SP2
-            if (!"".equals(httpRequest.getContextPath())) {
+            if (!httpRequest.getContextPath().isEmpty()) {
                 getServletContext().log(sm.getString("webDavFilter.xpRootContext"));
             }
             // Namespace issue maybe

diff --git a/java/org/apache/catalina/ha/backend/TcpSender.java b/java/org/apache/catalina/ha/backend/TcpSender.java
@@ -151,7 +151,7 @@ public int send(String mess) throws Exception {
                 // read all the headers.
                 String header = connectionReaders[i].readLine();
                 int contentLength = 0;
-                while (!"".equals(header)) {
+                while (!header.isEmpty()) {
                     int colon = header.indexOf(':');
                     String headerName = header.substring(0, colon).trim();
                     String headerValue = header.substring(colon + 1).trim();

diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -348,7 +348,7 @@ protected void changeRequestSessionID(Request request, String sessionId, String
 
         // set original sessionid at request, to allow application detect the
         // change
-        if (sessionIdAttribute != null && !"".equals(sessionIdAttribute)) {
+        if (sessionIdAttribute != null && !sessionIdAttribute.isEmpty()) {
             if (log.isDebugEnabled()) {
                 log.debug(sm.getString("jvmRoute.set.orignalsessionid",sessionIdAttribute,sessionId));
             }

diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -443,10 +443,11 @@ protected void list(HttpServletRequest request,
                 StringBuilder tmp = new StringBuilder();
                 tmp.append("path=");
                 tmp.append(URLEncoder.DEFAULT.encode(displayPath, StandardCharsets.UTF_8));
-                if (ctxt.getWebappVersion().length() > 0) {
+                final String webappVersion = ctxt.getWebappVersion();
+                if (webappVersion != null && webappVersion.length() > 0) {
                     tmp.append("&version=");
                     tmp.append(URLEncoder.DEFAULT.encode(
-                            ctxt.getWebappVersion(), StandardCharsets.UTF_8));
+                            webappVersion, StandardCharsets.UTF_8));
                 }
                 String pathVersion = tmp.toString();
 
@@ -463,10 +464,10 @@ protected void list(HttpServletRequest request,
                         + URLEncoder.DEFAULT.encode(contextPath + "/", StandardCharsets.UTF_8)
                         + "\" " + Constants.REL_EXTERNAL + ">"
                         + Escape.htmlElementContent(displayPath) + "</a>";
-                if ("".equals(ctxt.getWebappVersion())) {
+                if (webappVersion == null || webappVersion.isEmpty()) {
                     args[1] = noVersion;
                 } else {
-                    args[1] = Escape.htmlElementContent(ctxt.getWebappVersion());
+                    args[1] = Escape.htmlElementContent(webappVersion);
                 }
                 if (ctxt.getDisplayName() == null) {
                     args[2] = "&nbsp;";

diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -555,7 +555,7 @@ protected void findleaks(boolean statusLine, PrintWriter writer,
                         smClient.getString("managerServlet.findleaksList"));
             }
             for (String result : results) {
-                if ("".equals(result)) {
+                if (result.isEmpty()) {
                     result = "/";
                 }
                 writer.println(result);

diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -411,7 +411,7 @@ public void init() throws ServletException {
         host.addLifecycleListener(new HostConfig());
 
         // Add host aliases
-        if ((aliases != null) && !("".equals(aliases))) {
+        if ((aliases != null) && !aliases.isEmpty()) {
             StringTokenizer tok = new StringTokenizer(aliases, ", ");
             while (tok.hasMoreTokens()) {
                 host.addAlias(tok.nextToken());

diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java
@@ -1522,7 +1522,7 @@ public String toString() {
 
     private static X509UsernameRetriever createUsernameRetriever(String className)
         throws LifecycleException {
-        if(null == className || "".equals(className.trim()))
+        if(null == className || className.trim().isEmpty())
             return new X509SubjectDnRetriever();
 
         try {

diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -1077,7 +1077,7 @@ protected boolean setCGIEnvironment(HttpServletRequest req) throws IOException {
              * SHOULD NOT be defined.
              *
              */
-            if (!("".equals(sPathInfoCGI))) {
+            if (!sPathInfoCGI.isEmpty()) {
                 sPathTranslatedCGI = context.getRealPath(sPathInfoCGI);
             }
             if (sPathTranslatedCGI == null || "".equals(sPathTranslatedCGI)) {
@@ -1386,9 +1386,9 @@ protected String nullsToString(String couldBeNull,
          */
         protected String blanksToString(String couldBeBlank,
                                       String subForBlanks) {
-            return (("".equals(couldBeBlank) || couldBeBlank == null)
+            return (couldBeBlank == null || couldBeBlank.isEmpty())
                     ? subForBlanks
-                    : couldBeBlank);
+                    : couldBeBlank;
         }
 
 
@@ -1689,7 +1689,7 @@ public void run () {
                     try {
                         //set headers
                         String line = null;
-                        while (((line = cgiHeaderReader.readLine()) != null) && !("".equals(line))) {
+                        while (((line = cgiHeaderReader.readLine()) != null) && !line.isEmpty()) {
                             if (log.isTraceEnabled()) {
                                 log.trace("addHeader(\"" + line + "\")");
                             }

diff --git a/java/org/apache/catalina/session/JDBCStore.java b/java/org/apache/catalina/session/JDBCStore.java
@@ -445,7 +445,7 @@ public String getSessionLastAccessedCol() {
      * @param dataSourceName The JNDI name of the DataSource-factory
      */
     public void setDataSourceName(String dataSourceName) {
-        if (dataSourceName == null || "".equals(dataSourceName.trim())) {
+        if (dataSourceName == null || dataSourceName.trim().isEmpty()) {
             manager.getContext().getLogger().warn(
                     sm.getString(getStoreName() + ".missingDataSourceName"));
             return;

diff --git a/java/org/apache/catalina/storeconfig/StoreRegistry.java b/java/org/apache/catalina/storeconfig/StoreRegistry.java
@@ -182,7 +182,7 @@ public IStoreFactory findStoreFactory(Class<?> aClass) {
      */
     public void registerDescription(StoreDescription desc) {
         String key = desc.getId();
-        if (key == null || "".equals(key)) {
+        if (key == null || key.isEmpty()) {
             key = desc.getTagClass();
         }
         descriptors.put(key, desc);

diff --git a/java/org/apache/catalina/util/ContextName.java b/java/org/apache/catalina/util/ContextName.java
@@ -25,7 +25,7 @@
 public final class ContextName {
     public static final String ROOT_NAME = "ROOT";
     private static final String VERSION_MARKER = "##";
-    private static final String FWD_SLASH_REPLACEMENT = "#";
+    private static final char FWD_SLASH_REPLACEMENT = '#';
 
     private final String baseName;
     private final String path;
@@ -54,10 +54,10 @@ public ContextName(String name, boolean stripFileExtension) {
         }
 
         // Replace any remaining /
-        tmp1 = tmp1.replaceAll("/", FWD_SLASH_REPLACEMENT);
+        tmp1 = tmp1.replace('/', FWD_SLASH_REPLACEMENT);
 
         // Insert the ROOT name if required
-        if (tmp1.startsWith(VERSION_MARKER) || "".equals(tmp1)) {
+        if (tmp1.startsWith(VERSION_MARKER) || tmp1.isEmpty()) {
             tmp1 = ROOT_NAME + tmp1;
         }
 
@@ -84,7 +84,7 @@ public ContextName(String name, boolean stripFileExtension) {
         if (ROOT_NAME.equals(tmp2)) {
             path = "";
         } else {
-            path = "/" + tmp2.replaceAll(FWD_SLASH_REPLACEMENT, "/");
+            path = "/" + tmp2.replace(FWD_SLASH_REPLACEMENT, '/');
         }
 
         if (versionIndex > -1) {
@@ -116,21 +116,21 @@ public ContextName(String path, String version) {
         }
 
         // Name is path + version
-        if ("".equals(this.version)) {
+        if (this.version.isEmpty()) {
             name = this.path;
         } else {
             name = this.path + VERSION_MARKER + this.version;
         }
 
         // Base name is converted path + version
         StringBuilder tmp = new StringBuilder();
-        if ("".equals(this.path)) {
+        if (this.path.isEmpty()) {
             tmp.append(ROOT_NAME);
         } else {
-            tmp.append(this.path.substring(1).replaceAll("/",
+            tmp.append(this.path.substring(1).replace('/',
                     FWD_SLASH_REPLACEMENT));
         }
-        if (this.version.length() > 0) {
+        if (!this.version.isEmpty()) {
             tmp.append(VERSION_MARKER);
             tmp.append(this.version);
         }
@@ -161,7 +161,7 @@ public String getDisplayName() {
             tmp.append(path);
         }
 
-        if (!"".equals(version)) {
+        if (!version.isEmpty()) {
             tmp.append(VERSION_MARKER);
             tmp.append(version);
         }

diff --git a/java/org/apache/el/MethodExpressionImpl.java b/java/org/apache/el/MethodExpressionImpl.java
@@ -279,7 +279,7 @@ public void readExternal(ObjectInput in) throws IOException,
             ClassNotFoundException {
         this.expr = in.readUTF();
         String type = in.readUTF();
-        if (!"".equals(type)) {
+        if (!type.isEmpty()) {
             this.expectedType = ReflectionUtil.forName(type);
         }
         this.paramTypes = ReflectionUtil.toTypeArray(((String[]) in

diff --git a/java/org/apache/el/MethodExpressionLiteral.java b/java/org/apache/el/MethodExpressionLiteral.java
@@ -95,7 +95,7 @@ public boolean isLiteralText() {
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         this.expr = in.readUTF();
         String type = in.readUTF();
-        if (!"".equals(type)) {
+        if (!type.isEmpty()) {
             this.expectedType = ReflectionUtil.forName(type);
         }
         this.paramTypes = ReflectionUtil.toTypeArray(((String[]) in

diff --git a/java/org/apache/el/ValueExpressionImpl.java b/java/org/apache/el/ValueExpressionImpl.java
@@ -240,7 +240,7 @@ public void readExternal(ObjectInput in) throws IOException,
             ClassNotFoundException {
         this.expr = in.readUTF();
         String type = in.readUTF();
-        if (!"".equals(type)) {
+        if (!type.isEmpty()) {
             this.expectedType = ReflectionUtil.forName(type);
         }
         this.fnMapper = (FunctionMapper) in.readObject();

diff --git a/java/org/apache/el/ValueExpressionLiteral.java b/java/org/apache/el/ValueExpressionLiteral.java
@@ -129,7 +129,7 @@ public void readExternal(ObjectInput in) throws IOException,
             ClassNotFoundException {
         this.value = in.readObject();
         String type = in.readUTF();
-        if (!"".equals(type)) {
+        if (!type.isEmpty()) {
             this.expectedType = ReflectionUtil.forName(type);
         }
     }

diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java
@@ -540,19 +540,20 @@ public static final Object coerceToType(final ELContext ctx, final Object obj,
         if (obj == null)
             return null;
         if (obj instanceof String) {
+            String str = (String) obj;
             PropertyEditor editor = PropertyEditorManager.findEditor(type);
             if (editor == null) {
-                if ("".equals(obj)) {
+                if (str.isEmpty()) {
                     return null;
                 }
                 throw new ELException(MessageFactory.get("error.convert", obj,
                         obj.getClass(), type));
             } else {
                 try {
-                    editor.setAsText((String) obj);
+                    editor.setAsText(str);
                     return editor.getValue();
                 } catch (RuntimeException e) {
-                    if ("".equals(obj)) {
+                    if (str.isEmpty()) {
                         return null;
                     }
                     throw new ELException(MessageFactory.get("error.convert",

diff --git a/java/org/apache/el/lang/FunctionMapperImpl.java b/java/org/apache/el/lang/FunctionMapperImpl.java
@@ -146,7 +146,7 @@ public void readExternal(ObjectInput in) throws IOException,
                 ClassNotFoundException {
 
             this.prefix = in.readUTF();
-            if ("".equals(this.prefix)) this.prefix = null;
+            if (this.prefix.isEmpty()) this.prefix = null;
             this.localName = in.readUTF();
             this.owner = in.readUTF();
             this.name = in.readUTF();

diff --git a/java/org/apache/el/util/ReflectionUtil.java b/java/org/apache/el/util/ReflectionUtil.java
@@ -52,7 +52,7 @@ private ReflectionUtil() {
     }
 
     public static Class<?> forName(String name) throws ClassNotFoundException {
-        if (null == name || "".equals(name)) {
+        if (null == name || name.isEmpty()) {
             return null;
         }
         Class<?> c = forNamePrimitive(name);

diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
@@ -1147,7 +1147,7 @@ public void generateWebMapping( String file, JspCompilationContext clctxt )
         String packageName = clctxt.getServletPackageName();
 
         String thisServletName;
-        if  ("".equals(packageName)) {
+        if  (packageName.isEmpty()) {
             thisServletName = className;
         } else {
             thisServletName = packageName + '.' + className;

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
@@ -546,7 +546,7 @@ private void generateDestroy() {
      * preamble generation)
      */
     private void genPreamblePackage(String packageName) {
-        if (!"".equals(packageName) && packageName != null) {
+        if (packageName != null && !packageName.isEmpty()) {
             out.printil("package " + packageName + ";");
             out.println();
         }

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
@@ -1681,7 +1681,7 @@ private String[] getParameters(ELNode.Function func)
                     lastArg = true;
                 }
                 String arg = signature.substring(start, p).trim();
-                if (!"".equals(arg)) {
+                if (!arg.isEmpty()) {
                     params.add(arg);
                 }
                 if (lastArg) {

diff --git a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
@@ -85,7 +85,7 @@ public void begin(String namespace, String theName, Attributes attributes)
 
         for (int i = 0; i < attributes.getLength(); i++) {
             String name = attributes.getLocalName(i);
-            if ("".equals(name)) {
+            if (name.isEmpty()) {
                 name = attributes.getQName(i);
             }
             String value = attributes.getValue(i);

diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -192,7 +192,7 @@ static KeyStore getStore(String type, String provider, String path,
                 // Some key store types (e.g. hardware) expect the InputStream
                 // to be null
                 if(!("PKCS11".equalsIgnoreCase(type) ||
-                        "".equalsIgnoreCase(path)) ||
+                        path.isEmpty()) ||
                         "NONE".equalsIgnoreCase(path)) {
                     istream = ConfigFileLoader.getSource().getResource(path).getInputStream();
                 }

diff --git a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
@@ -734,7 +734,8 @@ private static ByteBuffer createRequest(URI uri, Map<String,List<String>> reqHea
 
         // Request line
         result.put(GET_BYTES);
-        if (null == uri.getPath() || "".equals(uri.getPath())) {
+        final String path = uri.getPath();
+        if (null == path || path.isEmpty()) {
             result.put(ROOT_URI_BYTES);
         } else {
             result.put(uri.getRawPath().getBytes(StandardCharsets.ISO_8859_1));