Merged HEAD (5.1) to 5.1.N (5.1.1)

118709 mcozma: ACE-4726 Max number of open files reached when browsing virtual folders (Linux OS)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/virtual/template/ApplyTemplateMethod.java

@@ -1,3 +1,4 @@
+
 /* 
  * Copyright (C) 2005-2015 Alfresco Software Limited.
  *
@@ -37,6 +38,8 @@ import org.alfresco.repo.virtual.ref.ResourceProcessingError;
 import org.alfresco.repo.virtual.ref.VanillaProtocol;
 import org.alfresco.repo.virtual.ref.VirtualProtocol;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Creates a {@link VirtualFolderDefinition} by executing the template indicated
@@ -50,6 +53,8 @@ public class ApplyTemplateMethod extends AbstractProtocolMethod<VirtualFolderDef
 
     private ActualEnvironment environment;
 
+    private static Log logger = LogFactory.getLog(ApplyTemplateMethod.class);
+
     public ApplyTemplateMethod(ActualEnvironment environment)
     {
         super();
@@ -126,13 +131,26 @@ public class ApplyTemplateMethod extends AbstractProtocolMethod<VirtualFolderDef
         {
             throw new ProtocolMethodException(e);
         }
+        finally
+        {
+            try
+            {
+                if (vanillaIS != null)
+                    vanillaIS.close();
+            }
+            catch (IOException ioe)
+            {
+                logger.warn("Failed to close input stream : " + ioe);
+            }
+        }
+
     }
 
     /**
      * Creates an empty {@link VirtualFolderDefinition} parameterized with a
      * {@link NullFilingRule} as this method is called for non-virtual nodes.
      * 
-     * @param protocol 
+     * @param protocol
      * @param reference
      * @return The empty {@link VirtualFolderDefinition}.
      */