From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 2 Nov 2009 18:56:52 +0000 (+0000)
Subject: StringBuffer -> StringBuilder for o.a.tomcat
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=28560d96001bd5712a44309241876cfbd75d5351;p=tomcat7.0

StringBuffer -> StringBuilder for o.a.tomcat

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

diff --git a/java/org/apache/tomcat/buildutil/Txt2Html.java b/java/org/apache/tomcat/buildutil/Txt2Html.java
index b8b974be7..18fc4de86 100644
--- a/java/org/apache/tomcat/buildutil/Txt2Html.java
+++ b/java/org/apache/tomcat/buildutil/Txt2Html.java
@@ -133,7 +133,7 @@ public class Txt2Html
         // Convert, line-by-line:
         String line;
         while( (line = in.readLine()) != null ) {
-            StringBuffer result = new StringBuffer();
+            StringBuilder result = new StringBuilder();
             int len = line.length();
             for( int i = 0; i < len; i++ ) {
                 char c = line.charAt( i );
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java b/java/org/apache/tomcat/util/IntrospectionUtils.java
index ed4f51905..56c46a393 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -466,7 +466,7 @@ public final class IntrospectionUtils {
         if (value.indexOf("$") < 0) {
             return value;
         }
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int prev = 0;
         // assert value!=nil
         int pos;
@@ -835,7 +835,7 @@ public final class IntrospectionUtils {
 
         if (log.isDebugEnabled()) {
             // debug
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("" + target.getClass().getName() + "." + methodN + "( ");
             for (int i = 0; i < params.length; i++) {
                 if (i > 0)
diff --git a/java/org/apache/tomcat/util/buf/CharChunk.java b/java/org/apache/tomcat/util/buf/CharChunk.java
index a2e8ca60b..91ece8b98 100644
--- a/java/org/apache/tomcat/util/buf/CharChunk.java
+++ b/java/org/apache/tomcat/util/buf/CharChunk.java
@@ -305,7 +305,7 @@ public final class CharChunk implements Cloneable, Serializable, CharSequence {
 
     /** Add data to the buffer
      */
-    public void append( StringBuffer sb )
+    public void append( StringBuilder sb )
 	throws IOException
     {
 	int len=sb.length();
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java
index e15976397..937d055d9 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -201,7 +201,7 @@ public final class UDecoder {
 	if( (!query || str.indexOf( '+' ) < 0) && str.indexOf( '%' ) < 0 )
 	    return str;
 	
-        StringBuffer dec = new StringBuffer();    // decoded string output
+        StringBuilder dec = new StringBuilder();    // decoded string output
         int strPos = 0;
         int strLen = str.length();
 
diff --git a/java/org/apache/tomcat/util/digester/CallMethodRule.java b/java/org/apache/tomcat/util/digester/CallMethodRule.java
index f98e253a2..85ada3844 100644
--- a/java/org/apache/tomcat/util/digester/CallMethodRule.java
+++ b/java/org/apache/tomcat/util/digester/CallMethodRule.java
@@ -486,7 +486,7 @@ public class CallMethodRule extends Rule {
         }
         
         if (target == null) {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("[CallMethodRule]{");
             sb.append(digester.match);
             sb.append("} Call target is null (");
@@ -500,7 +500,7 @@ public class CallMethodRule extends Rule {
         
         // Invoke the required method on the top object
         if (digester.log.isDebugEnabled()) {
-            StringBuffer sb = new StringBuffer("[CallMethodRule]{");
+            StringBuilder sb = new StringBuilder("[CallMethodRule]{");
             sb.append(digester.match);
             sb.append("} Call ");
             sb.append(target.getClass().getName());
@@ -556,7 +556,7 @@ public class CallMethodRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("CallMethodRule[");
+        StringBuilder sb = new StringBuilder("CallMethodRule[");
         sb.append("methodName=");
         sb.append(methodName);
         sb.append(", paramCount=");
diff --git a/java/org/apache/tomcat/util/digester/CallParamRule.java b/java/org/apache/tomcat/util/digester/CallParamRule.java
index 6d10e394f..89365c516 100644
--- a/java/org/apache/tomcat/util/digester/CallParamRule.java
+++ b/java/org/apache/tomcat/util/digester/CallParamRule.java
@@ -161,7 +161,7 @@ public class CallParamRule extends Rule {
             
             if (digester.log.isDebugEnabled()) {
             
-                StringBuffer sb = new StringBuffer("[CallParamRule]{");
+                StringBuilder sb = new StringBuilder("[CallParamRule]{");
                 sb.append(digester.match);
                 sb.append("} Save from stack; from stack?").append(fromStack);
                 sb.append("; object=").append(param);
@@ -223,7 +223,7 @@ public class CallParamRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("CallParamRule[");
+        StringBuilder sb = new StringBuilder("CallParamRule[");
         sb.append("paramIndex=");
         sb.append(paramIndex);
         sb.append(", attributeName=");
diff --git a/java/org/apache/tomcat/util/digester/Digester.java b/java/org/apache/tomcat/util/digester/Digester.java
index 5a55ff401..56b18d25c 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -162,14 +162,14 @@ public class Digester extends DefaultHandler {
     /**
      * The body text of the current element.
      */
-    protected StringBuffer bodyText = new StringBuffer();
+    protected StringBuilder bodyText = new StringBuilder();
 
 
     /**
      * The stack of body text string buffers for surrounding elements.
      */
-    protected ArrayStack<StringBuffer> bodyTexts =
-        new ArrayStack<StringBuffer>();
+    protected ArrayStack<StringBuilder> bodyTexts =
+        new ArrayStack<StringBuilder>();
 
 
     /**
@@ -1240,7 +1240,7 @@ public class Digester extends DefaultHandler {
         if (debug) {
             log.debug("  Pushing body text '" + bodyText.toString() + "'");
         }
-        bodyText = new StringBuffer();
+        bodyText = new StringBuilder();
 
         // the actual element name is either in localName or qName, depending 
         // on whether the parser is namespace aware
@@ -1250,7 +1250,7 @@ public class Digester extends DefaultHandler {
         }
 
         // Compute the current matching rule
-        StringBuffer sb = new StringBuffer(match);
+        StringBuilder sb = new StringBuilder(match);
         if (match.length() > 0) {
             sb.append('/');
         }
@@ -2744,11 +2744,11 @@ public class Digester extends DefaultHandler {
 
 
     /**
-     * Return a new StringBuffer containing the same contents as the
+     * Return a new StringBuilder containing the same contents as the
      * input buffer, except that data of form ${varname} have been
      * replaced by the value of that var as defined in the system property.
      */
-    private StringBuffer updateBodyText(StringBuffer bodyText) {
+    private StringBuilder updateBodyText(StringBuilder bodyText) {
         String in = bodyText.toString();
         String out;
         try {
@@ -2762,7 +2762,7 @@ public class Digester extends DefaultHandler {
             // a new buffer
             return bodyText;
         } else {
-            return new StringBuffer(out);
+            return new StringBuilder(out);
         }
     }
 
diff --git a/java/org/apache/tomcat/util/digester/FactoryCreateRule.java b/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
index c71ef7989..bf7e2dc38 100644
--- a/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
+++ b/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
@@ -347,7 +347,7 @@ public class FactoryCreateRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("FactoryCreateRule[");
+        StringBuilder sb = new StringBuilder("FactoryCreateRule[");
         sb.append("className=");
         sb.append(className);
         sb.append(", attributeName=");
diff --git a/java/org/apache/tomcat/util/digester/ObjectCreateRule.java b/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
index 2cf0120a4..e746584f1 100644
--- a/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
+++ b/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
@@ -168,7 +168,7 @@ public class ObjectCreateRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ObjectCreateRule[");
+        StringBuilder sb = new StringBuilder("ObjectCreateRule[");
         sb.append("className=");
         sb.append(className);
         sb.append(", attributeName=");
diff --git a/java/org/apache/tomcat/util/digester/ObjectParamRule.java b/java/org/apache/tomcat/util/digester/ObjectParamRule.java
index 927200b89..7b1d6a41f 100644
--- a/java/org/apache/tomcat/util/digester/ObjectParamRule.java
+++ b/java/org/apache/tomcat/util/digester/ObjectParamRule.java
@@ -112,7 +112,7 @@ public class ObjectParamRule extends Rule {
      * Render a printable version of this Rule.
      */
     public String toString() {
-        StringBuffer sb = new StringBuffer("ObjectParamRule[");
+        StringBuilder sb = new StringBuilder("ObjectParamRule[");
         sb.append("paramIndex=");
         sb.append(paramIndex);
         sb.append(", attributeName=");
diff --git a/java/org/apache/tomcat/util/digester/PathCallParamRule.java b/java/org/apache/tomcat/util/digester/PathCallParamRule.java
index d3f854948..673f37dc9 100644
--- a/java/org/apache/tomcat/util/digester/PathCallParamRule.java
+++ b/java/org/apache/tomcat/util/digester/PathCallParamRule.java
@@ -84,7 +84,7 @@ public class PathCallParamRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("PathCallParamRule[");
+        StringBuilder sb = new StringBuilder("PathCallParamRule[");
         sb.append("paramIndex=");
         sb.append(paramIndex);
         sb.append("]");
diff --git a/java/org/apache/tomcat/util/digester/SetNextRule.java b/java/org/apache/tomcat/util/digester/SetNextRule.java
index 6eae24b08..434bef8c2 100644
--- a/java/org/apache/tomcat/util/digester/SetNextRule.java
+++ b/java/org/apache/tomcat/util/digester/SetNextRule.java
@@ -207,7 +207,7 @@ public class SetNextRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetNextRule[");
+        StringBuilder sb = new StringBuilder("SetNextRule[");
         sb.append("methodName=");
         sb.append(methodName);
         sb.append(", paramType=");
diff --git a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
index 63d35cf85..b1aa18a83 100644
--- a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
+++ b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
@@ -264,7 +264,7 @@ public class SetPropertiesRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetPropertiesRule[");
+        StringBuilder sb = new StringBuilder("SetPropertiesRule[");
         sb.append("]");
         return (sb.toString());
 
diff --git a/java/org/apache/tomcat/util/digester/SetPropertyRule.java b/java/org/apache/tomcat/util/digester/SetPropertyRule.java
index a5c7d4074..8d018dac7 100644
--- a/java/org/apache/tomcat/util/digester/SetPropertyRule.java
+++ b/java/org/apache/tomcat/util/digester/SetPropertyRule.java
@@ -147,7 +147,7 @@ public class SetPropertyRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetPropertyRule[");
+        StringBuilder sb = new StringBuilder("SetPropertyRule[");
         sb.append("name=");
         sb.append(name);
         sb.append(", value=");
diff --git a/java/org/apache/tomcat/util/digester/SetRootRule.java b/java/org/apache/tomcat/util/digester/SetRootRule.java
index ee25f235b..9a2272100 100644
--- a/java/org/apache/tomcat/util/digester/SetRootRule.java
+++ b/java/org/apache/tomcat/util/digester/SetRootRule.java
@@ -208,7 +208,7 @@ public class SetRootRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetRootRule[");
+        StringBuilder sb = new StringBuilder("SetRootRule[");
         sb.append("methodName=");
         sb.append(methodName);
         sb.append(", paramType=");
diff --git a/java/org/apache/tomcat/util/digester/SetTopRule.java b/java/org/apache/tomcat/util/digester/SetTopRule.java
index 1fc09d50c..1f55c3d94 100644
--- a/java/org/apache/tomcat/util/digester/SetTopRule.java
+++ b/java/org/apache/tomcat/util/digester/SetTopRule.java
@@ -208,7 +208,7 @@ public class SetTopRule extends Rule {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("SetTopRule[");
+        StringBuilder sb = new StringBuilder("SetTopRule[");
         sb.append("methodName=");
         sb.append(methodName);
         sb.append(", paramType=");
diff --git a/java/org/apache/tomcat/util/http/HttpMessages.java b/java/org/apache/tomcat/util/http/HttpMessages.java
index fc519a9ab..195d30f3a 100644
--- a/java/org/apache/tomcat/util/http/HttpMessages.java
+++ b/java/org/apache/tomcat/util/http/HttpMessages.java
@@ -82,7 +82,7 @@ public class HttpMessages {
 
 	char content[] = new char[message.length()];
 	message.getChars(0, message.length(), content, 0);
-	StringBuffer result = new StringBuffer(content.length + 50);
+	StringBuilder result = new StringBuilder(content.length + 50);
 	for (int i = 0; i < content.length; i++) {
 	    switch (content[i]) {
 	    case '<':
diff --git a/java/org/apache/tomcat/util/http/Parameters.java b/java/org/apache/tomcat/util/http/Parameters.java
index 5f1a152f9..d67ac893f 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -362,7 +362,7 @@ public final class Parameters extends MultiMap {
     /** Debug purpose
      */
     public String paramsAsString() {
-        StringBuffer sb=new StringBuffer();
+        StringBuilder sb=new StringBuilder();
         Enumeration<String> en= paramHashStringArray.keys();
         while( en.hasMoreElements() ) {
             String k = en.nextElement();
diff --git a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
index 1ce4ec3fb..40c6c5d2c 100644
--- a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
@@ -759,7 +759,7 @@ public class MultipartStream
      */
     public String toString()
     {
-        StringBuffer sbTemp = new StringBuffer();
+        StringBuilder sbTemp = new StringBuilder();
         sbTemp.append("boundary='");
         sbTemp.append(String.valueOf(boundary));
         sbTemp.append("'\nbufSize=");
diff --git a/java/org/apache/tomcat/util/http/mapper/Mapper.java b/java/org/apache/tomcat/util/http/mapper/Mapper.java
index 4ef10eb39..d4a54ed86 100644
--- a/java/org/apache/tomcat/util/http/mapper/Mapper.java
+++ b/java/org/apache/tomcat/util/http/mapper/Mapper.java
@@ -500,7 +500,7 @@ public final class Mapper {
 
     public String getWrappersString( String host, String context ) {
         String names[]=getWrapperNames(host, context);
-        StringBuffer sb=new StringBuffer();
+        StringBuilder sb=new StringBuilder();
         for( int i=0; i<names.length; i++ ) {
             sb.append(names[i]).append(":");
         }
diff --git a/java/org/apache/tomcat/util/modeler/AttributeInfo.java b/java/org/apache/tomcat/util/modeler/AttributeInfo.java
index 5819b53ea..6560dba03 100644
--- a/java/org/apache/tomcat/util/modeler/AttributeInfo.java
+++ b/java/org/apache/tomcat/util/modeler/AttributeInfo.java
@@ -146,7 +146,7 @@ public class AttributeInfo extends FeatureInfo implements Serializable {
      */
     private String getMethodName(String name, boolean getter, boolean is) {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         if (getter) {
             if (is)
                 sb.append("is");
diff --git a/java/org/apache/tomcat/util/modeler/ManagedBean.java b/java/org/apache/tomcat/util/modeler/ManagedBean.java
index 9ea285cde..cf71c4ac2 100644
--- a/java/org/apache/tomcat/util/modeler/ManagedBean.java
+++ b/java/org/apache/tomcat/util/modeler/ManagedBean.java
@@ -462,7 +462,7 @@ public class ManagedBean implements java.io.Serializable
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("ManagedBean[");
+        StringBuilder sb = new StringBuilder("ManagedBean[");
         sb.append("name=");
         sb.append(name);
         sb.append(", className=");
diff --git a/java/org/apache/tomcat/util/modeler/NotificationInfo.java b/java/org/apache/tomcat/util/modeler/NotificationInfo.java
index f924d7e14..e6cd0c86c 100644
--- a/java/org/apache/tomcat/util/modeler/NotificationInfo.java
+++ b/java/org/apache/tomcat/util/modeler/NotificationInfo.java
@@ -125,7 +125,7 @@ public class NotificationInfo extends FeatureInfo implements Serializable {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("NotificationInfo[");
+        StringBuilder sb = new StringBuilder("NotificationInfo[");
         sb.append("name=");
         sb.append(name);
         sb.append(", description=");
diff --git a/java/org/apache/tomcat/util/net/URL.java b/java/org/apache/tomcat/util/net/URL.java
index 3521f6eb7..bde9420f6 100644
--- a/java/org/apache/tomcat/util/net/URL.java
+++ b/java/org/apache/tomcat/util/net/URL.java
@@ -534,7 +534,7 @@ public final class URL implements Serializable {
      */
     public String toExternalForm() {
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         if (protocol != null) {
             sb.append(protocol);
             sb.append(":");
@@ -563,7 +563,7 @@ public final class URL implements Serializable {
      */
     public String toString() {
 
-        StringBuffer sb = new StringBuffer("URL[");
+        StringBuilder sb = new StringBuilder("URL[");
         sb.append("authority=");
         sb.append(authority);
         sb.append(", file=");
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
index fd8dde5b9..4b3026a75 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
@@ -212,7 +212,7 @@ class JSSESupport implements SSLSupport, SSLSessionManager {
         byte [] ssl_session = session.getId();
         if ( ssl_session == null) 
             return null;
-        StringBuffer buf=new StringBuffer("");
+        StringBuilder buf=new StringBuilder("");
         for(int x=0; x<ssl_session.length; x++) {
             String digit=Integer.toHexString(ssl_session[x]);
             if (digit.length()<2) buf.append('0');