ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1027431 - in /ant/core/trunk/src/main/org/apache/tools/tar: TarBuffer.java TarOutputStream.java
Date Tue, 26 Oct 2010 09:49:56 GMT
Author: bodewig
Date: Tue Oct 26 09:49:56 2010
New Revision: 1027431

URL: http://svn.apache.org/viewvc?rev=1027431&view=rev
Log:
write all buffered data to the stream in TarOutputStream#finish.  PR 50014

Modified:
    ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java   (contents, props changed)
    ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java   (contents, props changed)

Modified: ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java?rev=1027431&r1=1027430&r2=1027431&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java Tue Oct 26 09:49:56 2010
@@ -418,7 +418,7 @@ public class TarBuffer {
     /**
      * Flush the current data block if it has any data in it.
      */
-    private void flushBlock() throws IOException {
+    void flushBlock() throws IOException {
         if (debug) {
             System.err.println("TarBuffer.flushBlock() called.");
         }

Propchange: ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 26 09:49:56 2010
@@ -0,0 +1 @@
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1027427

Modified: ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java?rev=1027431&r1=1027430&r2=1027431&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java Tue Oct 26 09:49:56
2010
@@ -132,6 +132,7 @@ public class TarOutputStream extends Fil
         // http://issues.apache.org/bugzilla/show_bug.cgi?id=28776
         writeEOFRecord();
         writeEOFRecord();
+        buffer.flushBlock();
     }
 
     /**

Propchange: ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 26 09:49:56 2010
@@ -0,0 +1 @@
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java:1027427



Mime
View raw message