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

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

Author: alesj
Date: 2009-02-16 14:55:00 -0500 (Mon, 16 Feb 2009)
New Revision: 84275

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
Log:
Only reset once.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-02-16 18:28:20 UTC (rev 84274)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-02-16 19:55:00 UTC (rev 84275)
@@ -472,22 +472,22 @@
       {
          Enumeration<? extends ZipEntry> zipEntries = zipSource.entries();
          // zoom-in on entries under rootEntryPath - ignoring the rest
-         while(zipEntries.hasMoreElements())
+         while (zipEntries.hasMoreElements())
          {
             ZipEntry ent = zipEntries.nextElement();
-            if(ent.getName().startsWith(rootEntryPath))
+            if (ent.getName().startsWith(rootEntryPath))
             {
                relevant.put(ent.getName(), ent);
             }
          }
 
          Map<String, ZipEntry> orderedRelevant = new TreeMap<String, ZipEntry>(relevant);
-         for(Map.Entry<String, ZipEntry> entry : orderedRelevant.entrySet())
+         for (Map.Entry<String, ZipEntry> entry : orderedRelevant.entrySet())
          {
             ZipEntry ent = entry.getValue();
             String fullName = ent.getName().substring(rootEntryPath.length());
 
-            String [] split = splitParentChild(fullName);
+            String[] split = splitParentChild(fullName);
             String parentPath = split[0];
             String name = split[1];
 
@@ -495,13 +495,13 @@
             if ("".equals(name) == false)
             {
                ei = entries.get(parentPath);
-               if(ei == null)
+               if (ei == null)
                   ei = makeDummyParent(parentPath);
             }
             AbstractVirtualFileHandler parent = ei != null ? ei.handler : null;
 
             // it's a nested jar
-            if(ent.isDirectory() == false && JarUtils.isArchive(ent.getName()))
+            if (ent.isDirectory() == false && JarUtils.isArchive(ent.getName()))
             {
                boolean useCopyMode = forceCopy;
                if (useCopyMode == false)
@@ -621,13 +621,16 @@
    /**
     * Reset init status.
     */
-   void resetInitStatus()
+   synchronized void resetInitStatus()
    {
-      EntryInfo rootInfo = entries.get("");
-      entries = new ConcurrentHashMap<String, EntryInfo>();
-      entries.put("", rootInfo);
+      if (initStatus != InitializationStatus.NOT_INITIALIZED)
+      {
+         EntryInfo rootInfo = entries.get("");
+         entries = new ConcurrentHashMap<String, EntryInfo>();
+         entries.put("", rootInfo);
 
-      initStatus = InitializationStatus.NOT_INITIALIZED;
+         initStatus = InitializationStatus.NOT_INITIALIZED;
+      }
    }
 
    /**