-Index: modules/util/src/main/java/org/mortbay/servlet/CGI.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/servlet/CGI.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/servlet/CGI.java (working copy)
-@@ -373,7 +373,7 @@
- * @throws IOException
- */
- private String getTextLineFromStream( InputStream is ) throws IOException {
-- StringBuffer buffer = new StringBuffer();
-+ StringBuilder buffer = new StringBuilder();
- int b;
-
- while( (b = is.read()) != -1 && b != (int) '\n' ) {
-Index: modules/util/src/main/java/org/mortbay/servlet/GzipFilter.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/servlet/GzipFilter.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/servlet/GzipFilter.java (working copy)
-@@ -330,7 +330,7 @@
- }
- catch (IOException e)
- {
-- throw new IllegalStateException();
-+ throw new IllegalStateException(e);
- }
- }
- }
-Index: modules/util/src/main/java/org/mortbay/servlet/UserAgentFilter.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/servlet/UserAgentFilter.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/servlet/UserAgentFilter.java (working copy)
-@@ -20,6 +20,7 @@
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
-+import java.util.concurrent.ConcurrentHashMap;
- import java.util.regex.Matcher;
- import java.util.regex.Pattern;
-
-@@ -55,7 +56,7 @@
- public class UserAgentFilter implements Filter
- {
- private Pattern _pattern;
-- private Map _agentCache = new HashMap();
-+ private Map _agentCache = new ConcurrentHashMap();
- private int _agentCacheSize=1024;
- private String _attribute;
-
-@@ -118,11 +119,8 @@
- if (ua==null)
- return null;
-
-- String tag;
-- synchronized(_agentCache)
-- {
-- tag = (String)_agentCache.get(ua);
-- }
-+ String tag = (String)_agentCache.get(ua);
-+
-
- if (tag==null)
- {
-@@ -144,12 +142,9 @@
- else
- tag=ua;
-
-- synchronized(_agentCache)
-- {
-- if (_agentCache.size()>=_agentCacheSize)
-+ if (_agentCache.size()>=_agentCacheSize)
- _agentCache.clear();
- _agentCache.put(ua,tag);
-- }
-
- }
- return tag;
-Index: modules/util/src/main/java/org/mortbay/thread/Timeout.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/thread/Timeout.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/thread/Timeout.java (working copy)
-@@ -237,7 +237,7 @@
- /* ------------------------------------------------------------ */
- public String toString()
- {
-- StringBuffer buf = new StringBuffer();
-+ StringBuilder buf = new StringBuilder();
- buf.append(super.toString());
-
- Task task = _head._next;
-Index: modules/util/src/main/java/org/mortbay/util/ajax/JSON.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/ajax/JSON.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/ajax/JSON.java (working copy)
-@@ -1031,7 +1031,7 @@
- {
- boolean minus=false;
- long number=0;
-- StringBuffer buffer=null;
-+ StringBuilder buffer=null;
-
- longLoop: while (source.hasNext())
- {
-@@ -1063,7 +1063,7 @@
- case '.':
- case 'e':
- case 'E':
-- buffer=new StringBuffer(16);
-+ buffer=new StringBuilder(16);
- if(minus)
- buffer.append('-');
- buffer.append(number);
-@@ -1079,8 +1079,6 @@
- if (buffer==null)
- return TypeUtil.newLong(minus?-1*number:number);
-
-- synchronized (buffer)
-- {
- doubleLoop: while (source.hasNext())
- {
- char c=source.peek();
-@@ -1110,7 +1108,6 @@
- }
- }
- return new Double(buffer.toString());
-- }
- }
-
- protected void seekTo(char seek, Source source)
-Index: modules/util/src/main/java/org/mortbay/util/ConcurrentMultiMap.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/ConcurrentMultiMap.java (revision 0)
-+++ modules/util/src/main/java/org/mortbay/util/ConcurrentMultiMap.java (revision 0)
-@@ -0,0 +1,303 @@
-+// ========================================================================
-+// Copyright 2004-2005 Mort Bay Consulting Pty. Ltd.
-+// ------------------------------------------------------------------------
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+// http://www.apache.org/licenses/LICENSE-2.0
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
-+// ========================================================================
-+
-+package org.mortbay.util;
-+
-+import java.util.Arrays;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.HashMap;
-+import java.util.Iterator;
-+import java.util.List;
-+import java.util.Map;
-+
-+/* ------------------------------------------------------------ */
-+/** A multi valued Map.
-+ * This Map specializes HashMap and provides methods
-+ * that operate on multi valued items.
-+ *
-+ * Implemented as a map of LazyList values
-+ *
-+ * @see LazyList
-+ * @author Greg Wilkins (gregw)
-+ */
-+public class ConcurrentMultiMap extends ConcurrentHashMap
-+ implements Cloneable
-+{
-+ /* ------------------------------------------------------------ */
-+ /** Constructor.
-+ */
-+ public ConcurrentMultiMap()
-+ {}
-+
-+ /* ------------------------------------------------------------ */
-+ /** Constructor.
-+ * @param size Capacity of the map
-+ */
-+ public ConcurrentMultiMap(int size)
-+ {
-+ super(size);
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ /** Constructor.
-+ * @param map
-+ */
-+ public ConcurrentMultiMap(Map map)
-+ {
-+ super((map.size()*3)/2);
-+ putAll(map);
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ /** Get multiple values.
-+ * Single valued entries are converted to singleton lists.
-+ * @param name The entry key.
-+ * @return Unmodifieable List of values.
-+ */
-+ public List getValues(Object name)
-+ {
-+ return LazyList.getList(super.get(name),true);
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ /** Get a value from a multiple value.
-+ * If the value is not a multivalue, then index 0 retrieves the
-+ * value or null.
-+ * @param name The entry key.
-+ * @param i Index of element to get.
-+ * @return Unmodifieable List of values.
-+ */
-+ public Object getValue(Object name,int i)
-+ {
-+ Object l=super.get(name);
-+ if (i==0 && LazyList.size(l)==0)
-+ return null;
-+ return LazyList.get(l,i);
-+ }
-+
-+
-+ /* ------------------------------------------------------------ */
-+ /** Get value as String.
-+ * Single valued items are converted to a String with the toString()
-+ * Object method. Multi valued entries are converted to a comma separated
-+ * List. No quoting of commas within values is performed.
-+ * @param name The entry key.
-+ * @return String value.
-+ */
-+ public String getString(Object name)
-+ {
-+ Object l=super.get(name);
-+ switch(LazyList.size(l))
-+ {
-+ case 0:
-+ return null;
-+ case 1:
-+ Object o=LazyList.get(l,0);
-+ return o==null?null:o.toString();
-+ default:
-+ StringBuffer values=new StringBuffer(128);
-+ synchronized(values)
-+ {
-+ for (int i=0; i0)
-+ values.append(',');
-+ values.append(e.toString());
-+ }
-+ }
-+ return values.toString();
-+ }
-+ }
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ public Object get(Object name)
-+ {
-+ Object l=super.get(name);
-+ switch(LazyList.size(l))
-+ {
-+ case 0:
-+ return null;
-+ case 1:
-+ Object o=LazyList.get(l,0);
-+ return o;
-+ default:
-+ return LazyList.getList(l,true);
-+ }
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ /** Put and entry into the map.
-+ * @param name The entry key.
-+ * @param value The entry value.
-+ * @return The previous value or null.
-+ */
-+ public Object put(Object name, Object value)
-+ {
-+ return super.put(name,LazyList.add(null,value));
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ /** Put multi valued entry.
-+ * @param name The entry key.
-+ * @param values The List of multiple values.
-+ * @return The previous value or null.
-+ */
-+ public Object putValues(Object name, List values)
-+ {
-+ return super.put(name,values);
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ /** Put multi valued entry.
-+ * @param name The entry key.
-+ * @param values The String array of multiple values.
-+ * @return The previous value or null.
-+ */
-+ public Object putValues(Object name, String[] values)
-+ {
-+ Object list=null;
-+ for (int i=0;i0)
-+ {
-+ ln=LazyList.remove(lo,value);
-+ if (ln==null)
-+ super.remove(name);
-+ else
-+ super.put(name, ln);
-+ }
-+ return LazyList.size(ln)!=s;
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ /** Put all contents of map.
-+ * @param m Map
-+ */
-+ public void putAll(Map m)
-+ {
-+ Iterator i = m.entrySet().iterator();
-+ boolean multi=m instanceof MultiMap;
-+ while(i.hasNext())
-+ {
-+ Map.Entry entry =
-+ (Map.Entry)i.next();
-+ if (multi)
-+ super.put(entry.getKey(),LazyList.clone(entry.getValue()));
-+ else
-+ put(entry.getKey(),entry.getValue());
-+ }
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ /**
-+ * @return Map of String arrays
-+ */
-+ public Map toStringArrayMap()
-+ {
-+ HashMap map = new HashMap(size()*3/2);
-+
-+ Iterator i = super.entrySet().iterator();
-+ while(i.hasNext())
-+ {
-+ Map.Entry entry = (Map.Entry)i.next();
-+ Object l = entry.getValue();
-+ String[] a = LazyList.toStringArray(l);
-+ // for (int j=a.length;j-->0;)
-+ // if (a[j]==null)
-+ // a[j]="";
-+ map.put(entry.getKey(),a);
-+ }
-+ return map;
-+ }
-+
-+ /* ------------------------------------------------------------ */
-+ public Object clone()
-+ throws CloneNotSupportedException
-+ {
-+ ConcurrentMultiMap mm = (ConcurrentMultiMap) super.clone();
-+
-+ Iterator iter = mm.entrySet().iterator();
-+ while (iter.hasNext())
-+ {
-+ Map.Entry entry = (Map.Entry)iter.next();
-+ entry.setValue(LazyList.clone(entry.getValue()));
-+ }
-+
-+ return mm;
-+ }
-+}
-Index: modules/util/src/main/java/org/mortbay/util/DateCache.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/DateCache.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/DateCache.java (working copy)
-@@ -155,7 +155,7 @@
- String ss2 = _formatString.substring( zIndex+3 );
- int tzOffset = tz.getRawOffset();
-
-- StringBuffer sb = new StringBuffer(_formatString.length()+10);
-+ StringBuilder sb = new StringBuilder(_formatString.length()+10);
- sb.append(ss1);
- sb.append("'");
- if( tzOffset >= 0 )
-@@ -254,17 +254,15 @@
-
- // Always format if we get here
- _lastSeconds = seconds;
-- StringBuffer sb=new StringBuffer(_secFormatString.length());
-- synchronized(sb)
-- {
-- sb.append(_secFormatString0);
-- int s=(int)(seconds%60);
-- if (s<10)
-- sb.append('0');
-- sb.append(s);
-- sb.append(_secFormatString1);
-- _lastResult=sb.toString();
-- }
-+ StringBuilder sb=new StringBuilder(_secFormatString.length());
-+ sb.append(_secFormatString0);
-+ int s=(int)(seconds%60);
-+ if (s<10)
-+ sb.append('0');
-+ sb.append(s);
-+ sb.append(_secFormatString1);
-+ _lastResult=sb.toString();
-+
-
- return _lastResult;
- }
-@@ -272,9 +270,9 @@
- /* ------------------------------------------------------------ */
- /** Format to string buffer.
- * @param inDate Date the format
-- * @param buffer StringBuffer
-+ * @param buffer StringBuilder
- */
-- public void format(long inDate, StringBuffer buffer)
-+ public void format(long inDate, StringBuilder buffer)
- {
- buffer.append(format(inDate));
- }
-Index: modules/util/src/main/java/org/mortbay/util/MultiMap.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/MultiMap.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/MultiMap.java (working copy)
-@@ -105,21 +105,20 @@
- Object o=LazyList.get(l,0);
- return o==null?null:o.toString();
- default:
-- StringBuffer values=new StringBuffer(128);
-- synchronized(values)
-+ {
-+ StringBuilder values=new StringBuilder(128);
-+ for (int i=0; i0)
-- values.append(',');
-- values.append(e.toString());
-- }
-- }
-- return values.toString();
-- }
-+ if (values.length()>0)
-+ values.append(',');
-+ values.append(e.toString());
-+ }
-+ }
-+ return values.toString();
-+ }
- }
- }
-
-Index: modules/util/src/main/java/org/mortbay/util/RolloverFileOutputStream.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/RolloverFileOutputStream.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/RolloverFileOutputStream.java (working copy)
-@@ -166,7 +166,7 @@
- synchronized(RolloverFileOutputStream.class)
- {
- if (__rollover==null)
-- __rollover=new Timer(true);
-+ __rollover=new Timer(RolloverFileOutputStream.class.getName(),true);
-
- _rollTask=new RollTask();
-
-Index: modules/util/src/main/java/org/mortbay/util/Scanner.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/Scanner.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/Scanner.java (working copy)
-@@ -43,6 +43,7 @@
- */
- public class Scanner
- {
-+ private static int __scannerId=0;
- private int _scanInterval;
- private List _listeners = Collections.synchronizedList(new ArrayList());
- private Map _prevScan = new HashMap();
-@@ -235,7 +236,7 @@
-
- public Timer newTimer ()
- {
-- return new Timer(true);
-+ return new Timer("Scanner-"+__scannerId++, true);
- }
-
- public void schedule ()
-Index: modules/util/src/main/java/org/mortbay/util/StringMap.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/StringMap.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/StringMap.java (working copy)
-@@ -613,15 +613,12 @@
- public Object setValue(Object o){Object old=_value;_value=o;return old;}
- public String toString()
- {
-- StringBuffer buf=new StringBuffer();
-- synchronized(buf)
-- {
-- toString(buf);
-- }
-+ StringBuilder buf=new StringBuilder();
-+ toString(buf);
- return buf.toString();
- }
-
-- private void toString(StringBuffer buf)
-+ private void toString(StringBuilder buf)
- {
- buf.append("{[");
- if (_char==null)
-Index: modules/util/src/main/java/org/mortbay/util/StringUtil.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/StringUtil.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/StringUtil.java (working copy)
-@@ -191,22 +191,20 @@
- if (i == -1)
- return s;
-
-- StringBuffer buf = new StringBuffer(s.length()+with.length());
-+ StringBuilder buf = new StringBuilder(s.length()+with.length());
-
-- synchronized(buf)
-+ do
- {
-- do
-- {
-- buf.append(s.substring(c,i));
-- buf.append(with);
-- c=i+sub.length();
-- } while ((i=s.indexOf(sub,c))!=-1);
--
-- if (c=0)
- {
-- buf=new StringBuffer(path.length()<<1);
-+ buf=new StringBuilder(path.length()<<1);
- break loop;
- }
- }
-@@ -169,7 +169,7 @@
- /* ------------------------------------------------------------ */
- /* Decode a URI path.
- * @param path The path the encode
-- * @param buf StringBuffer to encode path into
-+ * @param buf StringBuilder to encode path into
- */
- public static String decodePath(String path)
- {
-@@ -247,7 +247,7 @@
- /* ------------------------------------------------------------ */
- /* Decode a URI path.
- * @param path The path the encode
-- * @param buf StringBuffer to encode path into
-+ * @param buf StringBuilder to encode path into
- */
- public static String decodePath(byte[] buf, int offset, int length)
- {
-@@ -312,7 +312,7 @@
- if (split<0)
- split=p1.length();
-
-- StringBuffer buf = new StringBuffer(p1.length()+p2.length()+2);
-+ StringBuilder buf = new StringBuilder(p1.length()+p2.length()+2);
- buf.append(p1);
-
- if (buf.charAt(split-1)=='/')
-@@ -406,7 +406,7 @@
- if (start>=end)
- return path;
-
-- StringBuffer buf = new StringBuffer(path);
-+ StringBuilder buf = new StringBuilder(path);
- int delStart=-1;
- int delEnd=-1;
- int skip=0;
-Index: modules/util/src/main/java/org/mortbay/util/UrlEncoded.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/UrlEncoded.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/UrlEncoded.java (working copy)
-@@ -116,57 +116,56 @@
- {
- if (charset==null)
- charset=StringUtil.__UTF8;
--
-- StringBuffer result = new StringBuffer(128);
-- synchronized(result)
-+
-+ StringBuilder result = new StringBuilder(128);
-+
-+ Iterator iter = map.entrySet().iterator();
-+ while(iter.hasNext())
- {
-- Iterator iter = map.entrySet().iterator();
-- while(iter.hasNext())
-+ Map.Entry entry = (Map.Entry)iter.next();
-+
-+ String key = entry.getKey().toString();
-+ Object list = entry.getValue();
-+ int s=LazyList.size(list);
-+
-+ if (s==0)
- {
-- Map.Entry entry = (Map.Entry)iter.next();
--
-- String key = entry.getKey().toString();
-- Object list = entry.getValue();
-- int s=LazyList.size(list);
--
-- if (s==0)
-+ result.append(encodeString(key,charset));
-+ if(equalsForNullValue)
-+ result.append('=');
-+ }
-+ else
-+ {
-+ for (int i=0;i0)
-+ result.append('&');
-+ Object val=LazyList.get(list,i);
- result.append(encodeString(key,charset));
-- if(equalsForNullValue)
-- result.append('=');
-- }
-- else
-- {
-- for (int i=0;i0)
-- result.append('&');
-- Object val=LazyList.get(list,i);
-- result.append(encodeString(key,charset));
-
-- if (val!=null)
-+ if (val!=null)
-+ {
-+ String str=val.toString();
-+ if (str.length()>0)
- {
-- String str=val.toString();
-- if (str.length()>0)
-- {
-- result.append('=');
-- result.append(encodeString(str,charset));
-- }
-- else if (equalsForNullValue)
-- result.append('=');
-+ result.append('=');
-+ result.append(encodeString(str,charset));
- }
- else if (equalsForNullValue)
- result.append('=');
- }
-+ else if (equalsForNullValue)
-+ result.append('=');
- }
-- if (iter.hasNext())
-- result.append('&');
- }
-- return result.toString();
-+ if (iter.hasNext())
-+ result.append('&');
- }
-+ return result.toString();
- }
-
-
-+
- /* -------------------------------------------------------------- */
- /** Decoded parameters to Map.
- * @param content the string containing the encoded parameters
-Index: modules/util/src/main/java/org/mortbay/util/Utf8StringBuffer.java
-===================================================================
---- modules/util/src/main/java/org/mortbay/util/Utf8StringBuffer.java (revision 4733)
-+++ modules/util/src/main/java/org/mortbay/util/Utf8StringBuffer.java (working copy)
-@@ -26,6 +26,7 @@
- * The UTF-8 decoding is done by this class and no additional buffers or Readers are used.
- * The UTF-8 code was inspired by http://javolution.org
- *
-+ * This class is not synchronized and should probably be called Utf8StringBuilder
- */
- public class Utf8StringBuffer
- {
-Index: modules/util/src/test/java/org/mortbay/util/StringMapTest.java
-===================================================================
---- modules/util/src/test/java/org/mortbay/util/StringMapTest.java (revision 4733)
-+++ modules/util/src/test/java/org/mortbay/util/StringMapTest.java (working copy)
-@@ -133,7 +133,7 @@
- m5.put("aBc", "x");
- m5i.put("AbC", "x");
-
-- StringBuffer buffer=new StringBuffer();
-+ StringBuilder buffer=new StringBuilder();
- buffer.append("aBc");
- assertEquals("2",m5.get("abc"));
- assertEquals("x",m5.get(buffer));
-Index: modules/util/src/test/java/org/mortbay/util/StringUtilTest.java
-===================================================================
---- modules/util/src/test/java/org/mortbay/util/StringUtilTest.java (revision 4733)
-+++ modules/util/src/test/java/org/mortbay/util/StringUtilTest.java (working copy)
-@@ -137,7 +137,7 @@
-
- public void testAppend()
- {
-- StringBuffer buf = new StringBuffer();
-+ StringBuilder buf = new StringBuilder();
- buf.append('a');
- StringUtil.append(buf, "abc", 1, 1);
- StringUtil.append(buf, (byte)12, 16);
-Index: modules/util/src/test/java/org/mortbay/util/URITest.java
-===================================================================
---- modules/util/src/test/java/org/mortbay/util/URITest.java (revision 4733)
-+++ modules/util/src/test/java/org/mortbay/util/URITest.java (working copy)
-@@ -45,7 +45,7 @@
- public void testEncodePath()
- {
- // test basic encode/decode
-- StringBuffer buf = new StringBuffer();
-+ StringBuilder buf = new StringBuilder();
-
-
- buf.setLength(0);
Index: modules/jetty/src/test/java/org/mortbay/jetty/HttpServerTestBase.java
===================================================================
--- modules/jetty/src/test/java/org/mortbay/jetty/HttpServerTestBase.java (revision 5958)
+++ modules/jetty/src/test/java/org/mortbay/jetty/HttpServerTestBase.java (working copy)
@@ -251,7 +251,7 @@
{
int[] points=new int[pointCount];
- StringBuffer message=new StringBuffer();
+ StringBuilder message=new StringBuilder();
message.append("iteration #"+(i+1));
@@ -296,7 +296,7 @@
for (int i=0; i 0)
chain= new CachedChain(filters, servletHolder);
- synchronized(this)
- {
- if (_maxFilterChainsCacheSize>0 && _chainCache[requestType].size()>_maxFilterChainsCacheSize)
- _chainCache[requestType].clear();
- _chainCache[requestType].put(key,chain);
- }
+ if (_maxFilterChainsCacheSize>0 && _chainCache[requestType].size()>_maxFilterChainsCacheSize)
+ _chainCache[requestType].clear();
+ _chainCache[requestType].put(key,chain);
}
else if (LazyList.size(filters) > 0)
chain = new Chain(filters, servletHolder);
@@ -1223,7 +1219,7 @@
/* ------------------------------------------------------------ */
public String toString()
{
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
for (int i=0; i 0 && ((scheme.equalsIgnoreCase("http") && port != 80) || (scheme.equalsIgnoreCase("https") && port != 443)))
- {
- url.append(':');
- url.append(port);
- }
- return url;
+ url.append(scheme);
+ url.append("://");
+ url.append(getServerName());
+
+ if (port > 0 && ((scheme.equalsIgnoreCase("http") && port != 80) || (scheme.equalsIgnoreCase("https") && port != 443)))
+ {
+ url.append(':');
+ url.append(port);
}
+ return url;
}
/* ------------------------------------------------------------ */
Index: modules/jetty/src/main/java/org/mortbay/xml/XmlConfiguration.java
===================================================================
--- modules/jetty/src/main/java/org/mortbay/xml/XmlConfiguration.java (revision 5958)
+++ modules/jetty/src/main/java/org/mortbay/xml/XmlConfiguration.java (working copy)
@@ -838,16 +838,13 @@
else
{
// Get the multiple items as a single string
- StringBuffer buf = new StringBuffer();
- synchronized (buf)
+ StringBuilder buf = new StringBuilder();
+ for (int i = first; i <= last; i++)
{
- for (int i = first; i <= last; i++)
- {
- Object item = node.get(i);
- buf.append(itemValue(obj, item));
- }
- value = buf.toString();
+ Object item = node.get(i);
+ buf.append(itemValue(obj, item));
}
+ value = buf.toString();
}
}
Index: modules/jetty/src/main/java/org/mortbay/xml/XmlParser.java
===================================================================
--- modules/jetty/src/main/java/org/mortbay/xml/XmlParser.java (revision 5958)
+++ modules/jetty/src/main/java/org/mortbay/xml/XmlParser.java (working copy)
@@ -669,12 +669,9 @@
*/
public synchronized String toString(boolean tag)
{
- StringBuffer buf = new StringBuffer();
- synchronized (buf)
- {
- toString(buf, tag);
- return buf.toString();
- }
+ StringBuilder buf = new StringBuilder();
+ toString(buf, tag);
+ return buf.toString();
}
/* ------------------------------------------------------------ */
@@ -692,7 +689,7 @@
}
/* ------------------------------------------------------------ */
- private synchronized void toString(StringBuffer buf, boolean tag)
+ private synchronized void toString(StringBuilder buf, boolean tag)
{
if (tag)
{
Index: modules/jetty/src/main/java/org/mortbay/io/BufferUtil.java
===================================================================
--- modules/jetty/src/main/java/org/mortbay/io/BufferUtil.java (revision 5958)
+++ modules/jetty/src/main/java/org/mortbay/io/BufferUtil.java (working copy)
@@ -315,7 +315,7 @@
if (bytes!=null)
return new String(bytes,buffer.getIndex(),buffer.length(),StringUtil.__ISO_8859_1);
- StringBuffer b = new StringBuffer(buffer.length());
+ StringBuilder b = new StringBuilder(buffer.length());
for (int i=buffer.getIndex(),c=0;c");
buf.append(title);
buf.append("\n");
Index: modules/jetty/pom.xml
===================================================================
--- modules/jetty/pom.xml (revision 5958)
+++ modules/jetty/pom.xml (working copy)
@@ -36,6 +36,13 @@