[jboss-cvs] JBossAS SVN: r93908 - projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-09-22 03:38:34 -0400 (Tue, 22 Sep 2009)
New Revision: 93908

Modified:
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipFileWrapper.java
Log:
Read update only once.

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipFileWrapper.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipFileWrapper.java	2009-09-22 07:21:40 UTC (rev 93907)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipFileWrapper.java	2009-09-22 07:38:34 UTC (rev 93908)
@@ -210,13 +210,15 @@
 
       ensureZipFile();
 
-      InputStream is = zipFile.getInputStream(entry);
+      // make sure input stream and certs reader work on the same update
+      ZipEntry update = zipFile.getEntry(entry.getName());
+      InputStream is = zipFile.getInputStream(update);
       if (is == null)
          throw new IOException("Entry no longer available: " + entry.getName() + " in file " + file);
 
       // we need to update entry, from the new zif file
       if (entry instanceof EntryInfoAdapter)
-         EntryInfoAdapter.class.cast(entry).updateEntry(zipFile.getEntry(entry.getName()));
+         EntryInfoAdapter.class.cast(entry).updateEntry(update);
 
       InputStream zis = new CertificateReaderInputStream(entry, this, is);