Merged V2.1 to HEAD

6817: Fix for a resource bundle isue with regen renditions wizard and snapshot labels.
   6809: Fixes for locking and permission related issues relating to forms.
   6808: Uunit test update
   6799: AR-1760: Office webscript : property is undefined when opening a document
   6799: WCM submit dialog now sets focus to first field (label) rather than second (comment)
   6795: Fix to line break encoder.
   6781: WebDAV auth to return HTTP 401 instead of exception when user is null
   6775: Fix for appserver shutdown hang
   6761: Using avmService instead of nodeService to avoid a permission error MIT is seeing.
   6742: Fix for MIT locking issue for content contributors
   6706: Fixes to make wizard pages work in standards compliant mode.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-18 23:18:09 +00:00
parent ad43a4c904
commit 6e1e59e951
15 changed files with 216 additions and 56 deletions

View File

@@ -459,7 +459,7 @@ public final class Utils
{
try
{
StringBuilder parsedContent = new StringBuilder();
StringBuilder parsedContent = new StringBuilder(str.length() + 32);
BufferedReader reader = new BufferedReader(new StringReader(str));
String line = reader.readLine();
while (line != null)
@@ -468,7 +468,7 @@ public final class Utils
line = reader.readLine();
if (line != null)
{
parsedContent.append("<br/>");
parsedContent.append("<br>");
}
}