Author: doogie
Date: Sun Feb 21 01:33:44 2010
New Revision: 912284
URL:
http://svn.apache.org/viewvc?rev=912284&view=revLog:
If there is no ${, then don't create a list just to add a single item to
it.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=912284&r1=912283&r2=912284&view=diff==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Sun Feb 21 01:33:44 2010
@@ -199,15 +199,13 @@
if (length == 0) {
return null;
}
- int origLen = length;
- ArrayList<FlexibleStringExpander> strElems = new ArrayList<FlexibleStringExpander>();
String expression = new String(chars, 0, length + offset);
int start = expression.indexOf(openBracket, offset);
if (start == -1) {
- strElems.add(new ConstElem(chars, offset, length));
- strElems.trimToSize();
- return strElems.toArray(new FlexibleStringExpander[strElems.size()]);
+ return new FlexibleStringExpander[] { new ConstElem(chars, offset, length) };
}
+ int origLen = length;
+ ArrayList<FlexibleStringExpander> strElems = new ArrayList<FlexibleStringExpander>();
int currentInd = offset;
int end = -1;
while (start != -1) {