You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@commons.apache.org by se...@apache.org on 2009/04/27 22:21:49 UTC

svn commit: r769146 - /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java

Author: sebb
Date: Mon Apr 27 20:21:48 2009
New Revision: 769146

URL: http://svn.apache.org/viewvc?rev=769146&view=rev
Log:
Avoid NPE if closeArchiveEntry called with no active entry

Modified:
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java?rev=769146&r1=769145&r2=769146&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java Mon Apr 27 20:21:48 2009
@@ -254,6 +254,10 @@
         
         ensureOpen();
 
+        if (entry == null) {
+            throw new IOException("Trying to close non-existent entry");
+        }
+
         if (this.entry.getSize() != this.written) {
             throw new IOException("invalid entry size (expected "
                     + this.entry.getSize() + " but got " + this.written