[jboss-svn-commits] JBoss Common SVN: r3831 - in shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base: exporter and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 4 15:22:54 EST 2009
Author: aslak
Date: 2009-12-04 15:22:54 -0500 (Fri, 04 Dec 2009)
New Revision: 3831
Modified:
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ClassLoaderAsset.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/FileAsset.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/UrlAsset.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExportDelegate.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImpl.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/IOUtil.java
Log:
SHRINKWRAP-98 Added IO Patch. Increased buffer sizes and added Buffered Streams
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ClassLoaderAsset.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ClassLoaderAsset.java 2009-12-04 19:50:35 UTC (rev 3830)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/ClassLoaderAsset.java 2009-12-04 20:22:54 UTC (rev 3831)
@@ -16,6 +16,7 @@
*/
package org.jboss.shrinkwrap.impl.base.asset;
+import java.io.BufferedInputStream;
import java.io.InputStream;
import org.jboss.shrinkwrap.api.Asset;
@@ -74,7 +75,7 @@
@Override
public InputStream openStream()
{
- return classLoader.getResourceAsStream(resourceName);
+ return new BufferedInputStream(classLoader.getResourceAsStream(resourceName), 8192);
}
}
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/FileAsset.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/FileAsset.java 2009-12-04 19:50:35 UTC (rev 3830)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/FileAsset.java 2009-12-04 20:22:54 UTC (rev 3831)
@@ -16,6 +16,7 @@
*/
package org.jboss.shrinkwrap.impl.base.asset;
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -66,7 +67,7 @@
{
try
{
- return new FileInputStream(file);
+ return new BufferedInputStream(new FileInputStream(file), 8192);
}
catch (FileNotFoundException e)
{
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/UrlAsset.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/UrlAsset.java 2009-12-04 19:50:35 UTC (rev 3830)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/UrlAsset.java 2009-12-04 20:22:54 UTC (rev 3831)
@@ -16,6 +16,7 @@
*/
package org.jboss.shrinkwrap.impl.base.asset;
+import java.io.BufferedInputStream;
import java.io.InputStream;
import java.net.URL;
@@ -59,7 +60,7 @@
{
try
{
- return url.openStream();
+ return new BufferedInputStream(url.openStream(), 8192);
}
catch (Exception e)
{
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java 2009-12-04 19:50:35 UTC (rev 3830)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java 2009-12-04 20:22:54 UTC (rev 3831)
@@ -16,6 +16,7 @@
*/
package org.jboss.shrinkwrap.impl.base.exporter;
+import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
@@ -116,9 +117,10 @@
// Get the asset streams
final InputStream assetInputStream = asset.openStream();
final FileOutputStream assetFileOutputStream = new FileOutputStream(assetFile);
+ final BufferedOutputStream assetBufferedOutputStream = new BufferedOutputStream(assetFileOutputStream, 8192);
// Write contents
- IOUtil.copyWithClose(assetInputStream, assetFileOutputStream);
+ IOUtil.copyWithClose(assetInputStream, assetBufferedOutputStream);
}
catch (Throwable t)
{
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExportDelegate.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExportDelegate.java 2009-12-04 19:50:35 UTC (rev 3830)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExportDelegate.java 2009-12-04 20:22:54 UTC (rev 3831)
@@ -54,7 +54,7 @@
/**
* OutputStream to hold the output contents
*/
- private final ByteArrayOutputStream output = new ByteArrayOutputStream();
+ private final ByteArrayOutputStream output = new ByteArrayOutputStream(8192);
/**
* ZipOutputStream used to write the zip entries
@@ -91,7 +91,6 @@
protected void export()
{
zipOutputStream = new ZipOutputStream(output);
-
// Enclose every IO Operation so we can close up cleanly
IOUtil.closeOnComplete(zipOutputStream, new StreamTask<ZipOutputStream>()
{
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImpl.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImpl.java 2009-12-04 19:50:35 UTC (rev 3830)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImpl.java 2009-12-04 20:22:54 UTC (rev 3831)
@@ -95,8 +95,8 @@
}
String entryName = entry.getName();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- byte[] content = new byte[1024];
+ ByteArrayOutputStream output = new ByteArrayOutputStream(8192);
+ byte[] content = new byte[4096];
int readBytes;
while( (readBytes = stream.read(content, 0, content.length)) != -1)
{
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/IOUtil.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/IOUtil.java 2009-12-04 19:50:35 UTC (rev 3830)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/io/IOUtil.java 2009-12-04 20:22:54 UTC (rev 3831)
@@ -82,13 +82,12 @@
Validate.notNull(in, "stream must be specified");
// Get content as an array of bytes
- final ByteArrayOutputStream out = new ByteArrayOutputStream();
- final int len = 1024;
+ final ByteArrayOutputStream out = new ByteArrayOutputStream(8192);
+ final int len = 4096;
final byte[] buffer = new byte[len];
int read = 0;
try
{
-
while (((read = in.read(buffer)) != -1))
{
out.write(buffer, 0, read);
@@ -126,7 +125,7 @@
*/
public static void copy(InputStream input, OutputStream output)
{
- final byte[] buffer = new byte[1024];
+ final byte[] buffer = new byte[4096];
int read = 0;
try
{
@@ -134,6 +133,8 @@
{
output.write(buffer, 0, read);
}
+
+ output.flush();
}
catch (final IOException ioe)
{
More information about the jboss-svn-commits
mailing list