[jboss-cvs] JBossAS SVN: r74830 - in trunk/system/src/main/org/jboss/system/server: profileservice/repository and 1 other directory.

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

Author: alesj
Date: 2008-06-19 09:00:45 -0400 (Thu, 19 Jun 2008)
New Revision: 74830

Modified:
   trunk/system/src/main/org/jboss/system/server/profile/basic/ProfileImpl.java
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
Log:
Lazy assign values.

Modified: trunk/system/src/main/org/jboss/system/server/profile/basic/ProfileImpl.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/basic/ProfileImpl.java	2008-06-19 12:09:07 UTC (rev 74829)
+++ trunk/system/src/main/org/jboss/system/server/profile/basic/ProfileImpl.java	2008-06-19 13:00:45 UTC (rev 74830)
@@ -302,22 +302,22 @@
             VirtualFile parent = root.getParent();
             if( applicationDir == null || parent.getPathName().compareTo(applicationDir.getPathName()) < 0 )
                applicationDir = parent;
-            Long rootLastModified = root.getLastModified();
-            String name = root.getPathName();
             // Check for removal
             if( root.exists() == false )
             {
+               long rootLastModified = root.getLastModified();
                ModificationInfo info = new ModificationInfo(d, rootLastModified, ModifyStatus.REMOVED);
                modified.add(info);
                iter.remove();
                if( trace )
-                  log.trace(name+" was removed");
+                  log.trace(root.getPathName() + " was removed");
             }
             // Check for modification
             else if( root.hasBeenModified() )
             {
+               long rootLastModified = root.getLastModified();
                if( trace )
-                  log.trace(name+" was modified: "+rootLastModified);
+                  log.trace(root.getPathName() + " was modified: " + rootLastModified);
                // Need to create a duplicate ctx
                VFSDeployment deployment2 = deploymentFactory.createVFSDeployment(root);
                ModificationInfo info = new ModificationInfo(deployment2, rootLastModified, ModifyStatus.MODIFIED);

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2008-06-19 12:09:07 UTC (rev 74829)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2008-06-19 13:00:45 UTC (rev 74830)
@@ -434,29 +434,30 @@
             {
                VFSDeployment ctx = iter.next();
                VirtualFile root = ctx.getRoot();
+               String name = root.getPathName();
                // See if this file is locked
-               if(this.lockedApps.contains(root.getPathName()))
+               if(this.lockedApps.contains(name))
                {
                   if(trace)
                      log.trace("Ignoring locked application: "+root);
                   continue;
                }
-               Long rootLastModified = root.getLastModified();
-               String name = root.getPathName();
                // Check for removal
                if( root.exists() == false )
                {
+                  long rootLastModified = root.getLastModified();
                   ModificationInfo info = new ModificationInfo(ctx, rootLastModified, ModifyStatus.REMOVED);
                   modified.add(info);
                   iter.remove();
                   if( trace )
-                     log.trace(name+" was removed");
+                     log.trace(name + " was removed");
                }
                // Check for modification
                else if( root.hasBeenModified() )
                {
+                  long rootLastModified = root.getLastModified();
                   if( trace )
-                     log.trace(name+" was modified: "+rootLastModified);
+                     log.trace(name + " was modified: " + rootLastModified);
                   // Need to create a duplicate ctx
                   VFSDeployment ctx2 = loadDeploymentData(root);
                   ModificationInfo info = new ModificationInfo(ctx2, rootLastModified, ModifyStatus.MODIFIED);
@@ -471,13 +472,13 @@
                List<VirtualFile> children = deployDir.getChildren();
                for(VirtualFile vf : children)
                {
-                  URI uri = vf.toURI();
-                  if( applicationCtxs.containsKey(uri.toString()) == false )
+                  String key = vf.toURI().toString();
+                  if( applicationCtxs.containsKey(key) == false )
                   {
                      VFSDeployment ctx = loadDeploymentData(vf);
                      ModificationInfo info = new ModificationInfo(ctx, vf.getLastModified(), ModifyStatus.ADDED);
                      modified.add(info);
-                     applicationCtxs.put(vf.toURI().toString(), ctx);
+                     applicationCtxs.put(key, ctx);
                   }
                }
             }