[jboss-cvs] JBossAS SVN: r87552 - branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered.

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

Author: bstansberry at jboss.com
Date: 2009-04-20 04:07:53 -0400 (Mon, 20 Apr 2009)
New Revision: 87552

Modified:
   branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
Log:
Minor tidy up

Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java	2009-04-20 08:06:50 UTC (rev 87551)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java	2009-04-20 08:07:53 UTC (rev 87552)
@@ -760,15 +760,14 @@
     */
    private Collection<ModificationInfo> createModificationInfo() throws Exception
    {
+      boolean trace = log.isTraceEnabled();
       ArrayList<ModificationInfo> modified = new ArrayList<ModificationInfo>();
       Collection<ProfileDeployment> apps = getDeployments();
-      boolean trace = log.isTraceEnabled();
       if (trace)
          log.trace("Checking applications for modifications");
       if (apps != null)
       {
          Iterator<ProfileDeployment> iter = apps.iterator();
-         int ignoreFlags = DeploymentContentFlags.LOCKED | DeploymentContentFlags.DISABLED;
          while (iter.hasNext())
          {
             ProfileDeployment ctx = iter.next();
@@ -794,7 +793,8 @@
                   log.trace(pathName + " was removed");
             }
             // Check for modification
-            else if (getChecker().hasStructureBeenModified(root) || hasDeploymentContentFlags(pathName, DeploymentContentFlags.MODIFIED))
+            else if (hasDeploymentContentFlags(pathName, DeploymentContentFlags.MODIFIED)
+                  || getChecker().hasStructureBeenModified(root))
             {
                long rootLastModified = root.getLastModified();
                if (trace)
@@ -819,6 +819,8 @@
                   continue;
                }
                ProfileDeployment ctx = createDeployment(vf);
+               if (trace)
+                  log.trace(vf.getPathName() + " was added: " + vf.getLastModified());
                ModificationInfo info = new ModificationInfo(ctx, vf.getLastModified(), ModifyStatus.ADDED);
                modified.add(info);
                addDeployment(ctx.getName(), ctx);