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

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

Author: emuckenhuber
Date: 2008-10-22 15:22:22 -0400 (Wed, 22 Oct 2008)
New Revision: 79939

Modified:
   trunk/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
Log:
[JBAS-5883] unify the name usage.

Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java	2008-10-22 18:01:35 UTC (rev 79938)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java	2008-10-22 19:22:22 UTC (rev 79939)
@@ -188,7 +188,7 @@
       {
          VirtualFile vf = VFS.getRoot(contentURL);
          VFSDeployment vfsd = createDeployment(vf);
-         deploymentRepository.addDeployment(vf.getName(), vfsd, phase);
+         deploymentRepository.addDeployment(vfsd.getName(), vfsd, phase);
          mainDeployer.addDeployment(vfsd);
          mainDeployer.process();
          mainDeployer.checkComplete();         
@@ -215,7 +215,7 @@
          {
             VirtualFile vf = deploymentRepository.getDeploymentContent(name, phase);
             VFSDeployment vfsd = createDeployment(vf);
-            deploymentRepository.addDeployment(vf.getName(), vfsd, phase);
+            deploymentRepository.addDeployment(vfsd.getName(), vfsd, phase);
             deploymentRepository.unlockDeploymentContent(vf.getPathName(), phase);
             mainDeployer.addDeployment(vfsd);
             log.info("Scheduling start for: "+vfsd);

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-10-22 18:01:35 UTC (rev 79938)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2008-10-22 19:22:22 UTC (rev 79939)
@@ -960,7 +960,7 @@
          for(VirtualFile vf : children)
          {
             VFSDeployment vfCtx = loadDeploymentData(vf);
-            bootstrapCtxs.put(vf.getName(), vfCtx);       
+            bootstrapCtxs.put(vfCtx.getName(), vfCtx);       
          }
       }
       else
@@ -1007,8 +1007,7 @@
       for(VirtualFile vf : children)
       {
          VFSDeployment vfCtx = loadDeploymentData(vf);
-         String key = vfCtx.getName();
-         applicationCtxs.put(key, vfCtx);
+         applicationCtxs.put(vfCtx.getName(), vfCtx);
       }
    }