[jboss-cvs] JBossAS SVN: r79963 - trunk/management/src/main/org/jboss/management/j2ee/deployers.

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

Author: alesj
Date: 2008-10-23 04:58:31 -0400 (Thu, 23 Oct 2008)
New Revision: 79963

Modified:
   trunk/management/src/main/org/jboss/management/j2ee/deployers/AbstractJSR77Deployer.java
   trunk/management/src/main/org/jboss/management/j2ee/deployers/RarModuleJSR77Deployer.java
Log:
[JBAS-6124]; ignore null ObjectNames - org.jboss.management#debug shows the errors.
Generate display name if connector metadata doesn't have one.

Modified: trunk/management/src/main/org/jboss/management/j2ee/deployers/AbstractJSR77Deployer.java
===================================================================
--- trunk/management/src/main/org/jboss/management/j2ee/deployers/AbstractJSR77Deployer.java	2008-10-23 08:52:43 UTC (rev 79962)
+++ trunk/management/src/main/org/jboss/management/j2ee/deployers/AbstractJSR77Deployer.java	2008-10-23 08:58:31 UTC (rev 79963)
@@ -98,7 +98,9 @@
     */
    protected static void putObjectName(DeploymentUnit unit, String attachmentName, ObjectName name)
    {
-      unit.addAttachment(attachmentName + "." + ObjectName.class.getSimpleName(), name, ObjectName.class);
+      // something in org.jboss.management probably returned null, see log's debug for more info
+      if (name != null)
+         unit.addAttachment(attachmentName + "." + ObjectName.class.getSimpleName(), name, ObjectName.class);
    }
 
    /**

Modified: trunk/management/src/main/org/jboss/management/j2ee/deployers/RarModuleJSR77Deployer.java
===================================================================
--- trunk/management/src/main/org/jboss/management/j2ee/deployers/RarModuleJSR77Deployer.java	2008-10-23 08:52:43 UTC (rev 79962)
+++ trunk/management/src/main/org/jboss/management/j2ee/deployers/RarModuleJSR77Deployer.java	2008-10-23 08:58:31 UTC (rev 79963)
@@ -53,7 +53,7 @@
       putObjectName(unit, ResourceAdapter.class.getName(), jsr77ModuleName);
       log.debug("Created module: " + jsr77ModuleName);
       // Create the ResourceAdapter
-      ObjectName jsr77RAName = ResourceAdapter.create(server, metaData.getDescription().getDisplayName(), jsr77ModuleName, rarService);
+      ObjectName jsr77RAName = ResourceAdapter.create(server, getDisplayName(unit, metaData), jsr77ModuleName, rarService);
       // Register a mapping from the RARDeployment service to the ResourceAdapter
       putObjectName(unit, rarService.getCanonicalName(), jsr77RAName);
    }
@@ -62,7 +62,7 @@
    {
       ConnectorMetaData metaData = rdmd.getConnectorMetaData();
       ObjectName jsr77Name = removeObjectName(unit, ResourceAdapter.class.getName());
-      ResourceAdapter.destroy(server, metaData.getDescription().getDisplayName());
+      ResourceAdapter.destroy(server, getDisplayName(unit, metaData));
       log.debug("Destroy module: " + jsr77Name);
       if (jsr77Name != null)
       {
@@ -72,4 +72,22 @@
       if (rarService != null)
          removeObjectName(unit, rarService.getCanonicalName());
    }
+
+   /**
+    * Get display name.
+    *
+    * @param unit the deployment unit
+    * @param metaData the connector metadata
+    * @return metadata display name
+    */
+   protected String getDisplayName(VFSDeploymentUnit unit, ConnectorMetaData metaData)
+   {
+      String displayName = metaData.getDescription().getDisplayName();
+      if (displayName == null)
+      {
+         log.debug("ConnectorMetaData displayname is null: " + metaData);
+         displayName = unit.getSimpleName() + " [MISSING-DISPLAY-NAME]";
+      }
+      return displayName;
+   }
 }
\ No newline at end of file