Merged V2.2 to HEAD

10640: Fixed ETWOTWO-688: Node Path.Element strings are returned with numerical ordering suffix
   10641: Fix for ETWOTWO-640: Cannot login through FTP
   10665: Fix to generate legal Faces component IDs (in turn output as HTML element IDs). Fixes ETWOTWO-687 and ALFCOM-1756.
   10666: Fix for ETWOTWO-539.
   10675: Merged V2.1 to V2.2
     10649: Fix for ETWOONE-98 and extra error/debug logging. ... other linkvalidation enable/disable changes
   10711: Merged V2.1 to V2.2
      10615: Fix to keep org.alfresco.repo.workflow.jbpm.* in the session


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10712 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-09-04 01:54:39 +00:00
parent c257497885
commit 78e1f21f14
2 changed files with 94 additions and 33 deletions

View File

@@ -242,7 +242,7 @@ public class UploadContentServlet extends BaseServlet
writer.setEncoding(encoding);
// Stream the content into the repository
writer.putContent(req.getInputStream());
writer.putContent(inputStream);
if (logger.isDebugEnabled() == true)
{