[PLXCOMP-238] Failure when compress=false and files <= 4 bytes

Author: krosenvold

src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java

@@ -46,9 +46,7 @@ protected InputStream getInputStream( File file )
 
 
 	@Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
-		final BasicFileAttributes posixFileAttributes = Java7AttributeUtils.getFileAttributes( file );
-		PlexusIoResourceAttributes attrs = new Java7FileAttributes(file, posixFileAttributes, new HashMap<Integer, String>(), new HashMap<Integer, String>());
-		return attrs;
+        return new Java7FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
 	}
 
 	protected String getDefaultExtension()

src/main/java/org/codehaus/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java

@@ -45,8 +45,6 @@ protected InputStream getInputStream( File file )
     }
 
 	@Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
-		final BasicFileAttributes posixFileAttributes = Java7AttributeUtils.getFileAttributes( file );
-		PlexusIoResourceAttributes attrs = new Java7FileAttributes(file, posixFileAttributes, new HashMap<Integer, String>(), new HashMap<Integer, String>());
-		return attrs;
+        return new Java7FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
 	}
 }

src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java

@@ -444,15 +444,16 @@ protected final void addParentDirs( File baseDir, String entry, ZipArchiveOutput
         }
     }
 
-    private void readWithZipStats(InputStream in, byte[] header, ZipArchiveEntry ze, ByteArrayOutputStream bos) throws IOException {
+    private void readWithZipStats( InputStream in, byte[] header, int headerRead, ZipArchiveEntry ze,
+                                   ByteArrayOutputStream bos ) throws IOException {
         byte[] buffer = new byte[8 * 1024];
 
         CRC32 cal2 = new CRC32();
 
         long size = 0;
 
-        for (byte aHeader : header) {
-            cal2.update(aHeader);
+        for (int i = 0; i < headerRead; i++){
+            cal2.update(header[i]);
             size++;
         }
 
@@ -544,7 +545,7 @@ protected void zipFile( InputStream in, ZipArchiveOutputStream zOut, String vPat
                 if (in.markSupported())
                 {
                     in.mark( Integer.MAX_VALUE );
-                    readWithZipStats(in, header, ze, null);
+                    readWithZipStats(in, header, read, ze, null);
                     in.reset();
                     zOut.putArchiveEntry( ze);
                     if (read > 0) zOut.write(header, 0, read);
@@ -553,8 +554,9 @@ protected void zipFile( InputStream in, ZipArchiveOutputStream zOut, String vPat
                 else
                 {
                     // Store data into a byte[]
+                    // todo: explain how on earth this code works with zip streams > 128KB ???
                     ByteArrayOutputStream bos = new ByteArrayOutputStream(128 * 1024);
-                    readWithZipStats(in, header, ze, bos);
+                    readWithZipStats(in, header,read, ze, bos);
                     zOut.putArchiveEntry(ze);
                     if (read > 0) zOut.write(header, 0, read);
                     bos.writeTo( zOut);

src/test/java/org/codehaus/plexus/archiver/jar/JarArchiverTest.java

@@ -6,6 +6,7 @@
 import java.io.IOException;
 
 import junit.framework.TestCase;
+import org.codehaus.plexus.archiver.FileSet;
 
 public class JarArchiverTest
     extends TestCase
@@ -30,4 +31,16 @@ public void testCreateManifestOnlyJar()
         archiver.createArchive();
     }
 
+    public void testNonCompressed()
+        throws IOException, ManifestException, ArchiverException
+    {
+        File jarFile = new File("target/output/jarArchiveNonCompressed.jar" );
+
+        JarArchiver archiver = new JarArchiver();
+        archiver.setDestFile( jarFile );
+        archiver.setCompress( false );
+        archiver.addDirectory( new File( "src/test/resources/mjar179" ) );
+        archiver.createArchive();
+    }
+
 }

src/test/resources/mjar179/Messages.properties

@@ -0,0 +1 @@
+messageKey=Hello world !

src/test/resources/mjar179/Messages_en.properties

@@ -0,0 +1 @@
+messageKey=Bonjour le monde !