[jboss-cvs] JBossAS SVN: r84609 - trunk/system/src/main/org/jboss/system/server/profileservice/repository.

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

Author: emuckenhuber
Date: 2009-02-23 07:45:42 -0500 (Mon, 23 Feb 2009)
New Revision: 84609

Modified:
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/MutableDeploymentRepository.java
Log:
cleanup creation of profiledeployments

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java	2009-02-23 11:48:34 UTC (rev 84608)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java	2009-02-23 12:45:42 UTC (rev 84609)
@@ -159,7 +159,7 @@
       addedDeployments(added, applicationDir);
       for (VirtualFile vf : added)
       {
-         ProfileDeployment vfCtx = loadDeploymentData(vf);
+         ProfileDeployment vfCtx = createDeployment(vf);
          addDeployment(vfCtx.getName(), vfCtx);
       }
    }
@@ -360,7 +360,7 @@
       return flags;
    }
 
-   protected ProfileDeployment loadDeploymentData(VirtualFile vf) throws Exception
+   protected ProfileDeployment createDeployment(VirtualFile vf) throws Exception
    {
       return new AbstractProfileDeployment(vf);
    }

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/MutableDeploymentRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/MutableDeploymentRepository.java	2009-02-23 11:48:34 UTC (rev 84608)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/MutableDeploymentRepository.java	2009-02-23 12:45:42 UTC (rev 84609)
@@ -216,9 +216,8 @@
                   long rootLastModified = root.getLastModified();
                   if (trace)
                      log.trace(pathName + " was modified: " + rootLastModified);
-                  // Need to create a duplicate ctx
-                  ProfileDeployment ctx2 = loadDeploymentData(root);
-                  ModificationInfo info = new ModificationInfo(ctx2, rootLastModified, ModifyStatus.MODIFIED);
+                  // Create the modification info
+                  ModificationInfo info = new ModificationInfo(ctx, rootLastModified, ModifyStatus.MODIFIED);
                   modified.add(info);
                }
             }
@@ -236,7 +235,7 @@
                         log.trace("Ignoring locked application: " + vf);
                      continue;
                   }
-                  ProfileDeployment ctx = loadDeploymentData(vf);
+                  ProfileDeployment ctx = createDeployment(vf);
                   ModificationInfo info = new ModificationInfo(ctx, vf.getLastModified(), ModifyStatus.ADDED);
                   modified.add(info);
                   addDeployment(ctx.getName(), ctx);