From 79c8cb54fedcd3143c8db06bccd6f4e4797f7c18 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Fri, 6 Apr 2018 15:07:45 +0200
Subject: [PATCH] More StringBuffer size checks

---
 .../tools/ant/filters/EscapeUnicode.java       |  8 ++++----
 .../apache/tools/ant/taskdefs/ExecuteOn.java   |  4 ++--
 .../apache/tools/ant/taskdefs/Redirector.java  |  2 +-
 .../ant/taskdefs/optional/ejb/IPlanetEjbc.java | 18 +++++++++---------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/org/apache/tools/ant/filters/EscapeUnicode.java b/src/main/org/apache/tools/ant/filters/EscapeUnicode.java
index dd4543959..46c54635c 100644
--- a/src/main/org/apache/tools/ant/filters/EscapeUnicode.java
+++ b/src/main/org/apache/tools/ant/filters/EscapeUnicode.java
@@ -82,7 +82,10 @@ public class EscapeUnicode
         }
 
         int ch = -1;
-        if (unicodeBuf.length() == 0) {
+        if (unicodeBuf.length() > 0) {
+            ch = (int) unicodeBuf.charAt(0);
+            unicodeBuf.deleteCharAt(0);
+        } else {
             ch = in.read();
             if (ch != -1) {
                 char achar = (char) ch;
@@ -91,9 +94,6 @@ public class EscapeUnicode
                     ch = '\\';
                 }
             }
-        } else {
-            ch = (int) unicodeBuf.charAt(0);
-            unicodeBuf.deleteCharAt(0);
         }
         return ch;
     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
index 7825fac86..8994978d7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
@@ -615,8 +615,8 @@ public class ExecuteOn extends ExecTask {
             if (forwardSlash && fileSeparator != '/') {
                 src = src.replace(fileSeparator, '/');
             }
-            if (srcFilePos != null && (srcFilePos.getPrefix().length() > 0
-                    || srcFilePos.getSuffix().length() > 0)) {
+            if (srcFilePos != null
+                    && (!srcFilePos.getPrefix().isEmpty() || !srcFilePos.getSuffix().isEmpty())) {
                 src = srcFilePos.getPrefix() + src + srcFilePos.getSuffix();
             }
             result[srcIndex + i] = src;
diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
index 6bb740e44..036a1bf2c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
@@ -561,7 +561,7 @@ public class Redirector {
         String line = null;
         final StringBuffer val = new StringBuffer();
         while ((line = in.readLine()) != null) {
-            if (val.length() != 0) {
+            if (val.length() > 0) {
                 val.append(StringUtils.LINE_SEP);
             }
             val.append(line);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
index 03ce33133..8c930bc23 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
@@ -436,31 +436,31 @@ public class IPlanetEjbc {
      */
     protected void checkConfiguration() throws EjbcException {
 
-        String msg = "";
+        StringBuilder msg = new StringBuilder();
 
         if (stdDescriptor == null) {
-            msg += "A standard XML descriptor file must be specified.  ";
+            msg.append("A standard XML descriptor file must be specified.  ");
         }
         if (iasDescriptor == null) {
-            msg += "An iAS-specific XML descriptor file must be specified.  ";
+            msg.append("An iAS-specific XML descriptor file must be specified.  ");
         }
         if (classpath == null) {
-            msg += "A classpath must be specified.    ";
+            msg.append("A classpath must be specified.    ");
         }
         if (parser == null) {
-            msg += "An XML parser must be specified.    ";
+            msg.append("An XML parser must be specified.    ");
         }
 
         if (destDirectory == null) {
-            msg += "A destination directory must be specified.  ";
+            msg.append("A destination directory must be specified.  ");
         } else if (!destDirectory.exists()) {
-            msg += "The destination directory specified does not exist.  ";
+            msg.append("The destination directory specified does not exist.  ");
         } else if (!destDirectory.isDirectory()) {
-            msg += "The destination specified is not a directory.  ";
+            msg.append("The destination specified is not a directory.  ");
         }
 
         if (msg.length() > 0) {
-            throw new EjbcException(msg);
+            throw new EjbcException(msg.toString());
         }
     }