[jboss-cvs] JBossAS SVN: r87337 - in projects/jboss-deployers/trunk: deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure and 1 other directory.

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

Author: alesj
Date: 2009-04-15 07:59:31 -0400 (Wed, 15 Apr 2009)
New Revision: 87337

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructureBuilder.java
Log:
Synch on reDeploy map.
Ignore deprecation.

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java	2009-04-15 11:31:26 UTC (rev 87336)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java	2009-04-15 11:59:31 UTC (rev 87337)
@@ -106,7 +106,7 @@
    private Comparator<DeploymentContext> reverted;
 
    /** The re-deployments */
-   private Map<String, Deployment> toRedeploy = Collections.synchronizedMap(new LinkedHashMap<String, Deployment>());
+   private final Map<String, Deployment> toRedeploy = Collections.synchronizedMap(new LinkedHashMap<String, Deployment>());
 
    /**
     * Set the top deployment context comparator.
@@ -647,8 +647,12 @@
          if (shutdown.get())
             throw new IllegalStateException("The main deployer is shutdown");
 
-         Map<String, Deployment> copy = new LinkedHashMap<String, Deployment>(toRedeploy);
-         toRedeploy.clear();
+         Map<String, Deployment> copy = new LinkedHashMap<String, Deployment>();         
+         synchronized (toRedeploy)
+         {
+            copy.putAll(toRedeploy);
+            toRedeploy.clear();
+         }
 
          try
          {

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructureBuilder.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructureBuilder.java	2009-04-15 11:31:26 UTC (rev 87336)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructureBuilder.java	2009-04-15 11:59:31 UTC (rev 87337)
@@ -87,6 +87,7 @@
          try
          {
             VirtualFile parentFile = vfsParent.getRoot();
+            @SuppressWarnings("deprecation")
             VirtualFile file = parentFile.findChild(path); // leaving the findChild usage
             return new AbstractVFSDeploymentContext(applyModification(file, child), path);
          }
@@ -141,6 +142,7 @@
       return modified;
    }
 
+   @SuppressWarnings("deprecation")
    protected void applyContextInfo(DeploymentContext context, ContextInfo contextInfo) throws Exception
    {
       super.applyContextInfo(context, contextInfo);
@@ -172,7 +174,9 @@
                String suffixes = entry.getSuffixes();
                VirtualFile child;
                if (entry.getPath().length() == 0)
+               {
                   child = root;
+               }
                else
                {
                   try