update commons-io version & small update

pom.xml

@@ -59,7 +59,7 @@
   </developers>
 
 	<properties>
-    <commons-io.dependency>2.0</commons-io.dependency>
+    <commons-io.dependency>2.0.1</commons-io.dependency>
     <commons-lang.dependency>2.5</commons-lang.dependency>       
     <slf4j.dependency>1.6.0</slf4j.dependency>    
 		<maven.dependency>2.2.1</maven.dependency>    

wro4j-core/src/main/java/ro/isdc/wro/model/group/processor/PreProcessorExecutor.java

@@ -1,6 +1,5 @@
 package ro.isdc.wro.model.group.processor;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -101,7 +100,6 @@ private String processSingleResource(final Resource resource, final List<Resourc
   private String applyPreProcessors(final Resource resource, final List<Resource> resources, final Collection<ResourcePreProcessor> processors)
     throws IOException {
     //TODO close reader & writer?
-    // get original content
     Reader reader = null;
     try {
       try {
@@ -131,12 +129,12 @@ private String applyPreProcessors(final Resource resource, final List<Resource>
           IOUtils.copy(reader, writer);
           LOG.debug("skipped processing on resource: " + resource);
         }
+        reader.close();
         reader = new StringReader(writer.toString());
       }
       return writer.toString();
     } finally {
       if (reader != null) {
-        //it is important to close the reader here, otherwise some web servers will complain
         reader.close();
       }
     }
@@ -157,8 +155,7 @@ private Reader getResourceReader(final Resource resource, final List<Resource> r
         duplicateResourceDetector.addResourceUri(r.getUri());
       }
       is = uriLocatorFactory.locate(resource.getUri());
-      // wrap reader with bufferedReader for top efficiency
-      return new BufferedReader(new InputStreamReader(new SmartEncodingInputStream(is)));
+      return new InputStreamReader(new SmartEncodingInputStream(is));
     } finally {
       duplicateResourceDetector.reset();
     }

wro4j-core/src/main/java/ro/isdc/wro/model/resource/locator/UrlUriLocator.java

@@ -3,6 +3,7 @@
  */
 package ro.isdc.wro.model.resource.locator;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -63,7 +64,6 @@ public InputStream locate(final String uri) throws IOException {
       throw new IllegalArgumentException("uri cannot be NULL!");
     }
     LOG.debug("Reading uri: " + uri);
-
     try {
       if (getWildcardStreamLocator().hasWildcard(uri)) {
         final String fullPath = FilenameUtils.getFullPath(uri);
@@ -76,6 +76,6 @@ public InputStream locate(final String uri) throws IOException {
     }
 
     final URL url = new URL(uri);
-    return url.openStream();
+    return new BufferedInputStream(url.openStream());
   }
 }

wro4j-core/src/main/java/ro/isdc/wro/model/resource/locator/wildcard/DefaultWildcardStreamLocator.java

@@ -3,6 +3,7 @@
  */
 package ro.isdc.wro.model.resource.locator.wildcard;
 
+import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -89,9 +90,9 @@ public InputStream locateStream(final String uri, final File folder)
     for (final File file : files) {
       final InputStream is = new FileInputStream(file);
       IOUtils.copy(is, out);
+      is.close();
     }
-    out.close();
-    return new ByteArrayInputStream(out.toByteArray());
+    return new BufferedInputStream(new ByteArrayInputStream(out.toByteArray()));
   }
 
   /**

wro4j-core/src/main/java/ro/isdc/wro/model/resource/processor/impl/MultiLineCommentStripperProcessor.java

@@ -22,30 +22,36 @@
  * @author Alex Objelean
  * @created Created on Nov 28, 2008
  */
-public class MultiLineCommentStripperProcessor implements ResourcePreProcessor,
-    ResourcePostProcessor {
+public class MultiLineCommentStripperProcessor
+  implements ResourcePreProcessor, ResourcePostProcessor {
   /**
    * Pattern containing a regex matching multiline comments & empty new lines.
    */
-  public static Pattern PATTERN = Pattern.compile("[\\t ]*/\\*.*?\\*/\\r\\n?",
-      Pattern.DOTALL);
+  public static Pattern PATTERN = Pattern.compile("[\\t ]*/\\*.*?\\*/\\r\\n?", Pattern.DOTALL);
+
 
   /**
    * {@inheritDoc}
    */
   public void process(final Reader source, final Writer destination)
-      throws IOException {
-    final String content = IOUtils.toString(source);
-    String result = PATTERN.matcher(content).replaceAll("");
-    result = WroUtil.EMTPY_LINE_PATTERN.matcher(result).replaceAll("");
-    destination.write(result);
+    throws IOException {
+    try {
+      final String content = IOUtils.toString(source);
+      String result = PATTERN.matcher(content).replaceAll("");
+      result = WroUtil.EMTPY_LINE_PATTERN.matcher(result).replaceAll("");
+      destination.write(result);
+    } finally {
+      source.close();
+      destination.close();
+    }
   }
 
+
   /**
    * {@inheritDoc}
    */
-  public void process(final Resource resource, final Reader reader,
-      final Writer writer) throws IOException {
+  public void process(final Resource resource, final Reader reader, final Writer writer)
+    throws IOException {
     // resourceUri doesn't matter
     process(reader, writer);
   }

wro4j-extensions/src/main/java/ro/isdc/wro/extensions/processor/js/UglifyJsProcessor.java

@@ -4,9 +4,6 @@
  */
 package ro.isdc.wro.extensions.processor.js;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import ro.isdc.wro.extensions.processor.algorithm.uglify.UglifyJs;
 import ro.isdc.wro.model.group.processor.Minimize;
 import ro.isdc.wro.model.resource.ResourceType;
@@ -22,8 +19,6 @@
 @Minimize
 @SupportedResourceType(ResourceType.JS)
 public class UglifyJsProcessor extends BeautifyJsProcessor {
-  private static final Logger LOG = LoggerFactory.getLogger(UglifyJsProcessor.class);
-
   /**
    * @return new instance of {@link UglifyJs} engine.
    */