[jboss-cvs] JBossAS SVN: r61567 - trunk/connector/src/main/org/jboss/resource/metadata/repository.

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

Author: weston.price at jboss.com
Date: 2007-03-22 01:32:39 -0400 (Thu, 22 Mar 2007)
New Revision: 61567

Modified:
   trunk/connector/src/main/org/jboss/resource/metadata/repository/JCAMetaDataRepository.java
Log:
[JBAS-1425] Programmatic deployment improvements and cleanup.

Modified: trunk/connector/src/main/org/jboss/resource/metadata/repository/JCAMetaDataRepository.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/repository/JCAMetaDataRepository.java	2007-03-22 05:32:24 UTC (rev 61566)
+++ trunk/connector/src/main/org/jboss/resource/metadata/repository/JCAMetaDataRepository.java	2007-03-22 05:32:39 UTC (rev 61567)
@@ -43,7 +43,6 @@
 {
       
    private Map<JCAConnectorMetaDataKey, JCAConnectorMetaDataEntry> connectors = new ConcurrentHashMap<JCAConnectorMetaDataKey, JCAConnectorMetaDataEntry>();
-   private Map<JCADeploymentMetaDataEntry, Object> pendingDeployments = new ConcurrentHashMap<JCADeploymentMetaDataEntry, Object>();
    
    public JCAMetaDataRepository()
    {      
@@ -56,15 +55,18 @@
 
       JCAConnectorMetaDataEntry entry = connectors.get(key);
       
-      if(entry.getConnectorMetaData() == null)
-      {
-         entry.setConnectorMetaData(cmd);         
+      if(entry != null)
+      {            
+         entry.setConnectorMetaData(cmd);                     
       }
       else
       {
-         //Something is really wrong -- duplicate deployment
+         entry = new JCAConnectorMetaDataEntry();
+         entry.setConnectorMetaData(cmd);
+         connectors.put(key, entry);
       }
       
+      
    }
 
    public ConnectorMetaData getConnectorMetaData(String name)