[jboss-cvs] JBossAS SVN: r84457 - trunk/deployment/src/main/org/jboss/deployment/services.

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

Author: alesj
Date: 2009-02-19 08:30:27 -0500 (Thu, 19 Feb 2009)
New Revision: 84457

Modified:
   trunk/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java
Log:
[JBCTS-901]; get context after processing.

Modified: trunk/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java
===================================================================
--- trunk/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java	2009-02-19 13:25:29 UTC (rev 84456)
+++ trunk/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java	2009-02-19 13:30:27 UTC (rev 84457)
@@ -376,13 +376,15 @@
     */
    private String getComponentName(DeploymentContext context)
    {
+      if (context == null)
+         return null;
+
       DeploymentUnit u = context.getDeploymentUnit();
       ServiceMetaData data = u.getAttachment(ServiceMetaData.class);
       if (data == null)
          return null;
       ObjectName objectName = data.getObjectName();
-      String objNames = objectName.toString();
-      return objNames;
+      return objectName.toString();
    }
 
    public void deploy_phase2(String url) throws Exception
@@ -406,10 +408,11 @@
       VirtualFile root = VFS.getRoot(deployFile.toURI());
       Deployment deployment = deploymentFactory.createVFSDeployment(root);
       mainDeployer.addDeployment(deployment);
-      DeploymentContext context = mainDeployer.getDeploymentContext(deployment.getName());
+      DeploymentContext context = null;
       try
       {
          mainDeployer.process();
+         context = mainDeployer.getDeploymentContext(deployment.getName());
          mainDeployer.checkComplete(deployment);
       }
       catch (Exception e)