[teiid-commits] teiid SVN: r892 - trunk/server/src/main/java/com/metamatrix/platform/config/service.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-05-07 23:23:10 -0400 (Thu, 07 May 2009)
New Revision: 892

Modified:
   trunk/server/src/main/java/com/metamatrix/platform/config/service/ConfigurationServiceImpl.java
Log:
Teiid 470 - when importing connector binding from mmadmin, a NPE was occurring.   

Modified: trunk/server/src/main/java/com/metamatrix/platform/config/service/ConfigurationServiceImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/config/service/ConfigurationServiceImpl.java	2009-05-08 03:17:07 UTC (rev 891)
+++ trunk/server/src/main/java/com/metamatrix/platform/config/service/ConfigurationServiceImpl.java	2009-05-08 03:23:10 UTC (rev 892)
@@ -762,19 +762,20 @@
 
  
             if (vmName != null) {
-            	if (vmName.equalsIgnoreCase("all")) { //$NON-NLS-1$
+            	// for now, deploy the binding to all vms
+ //           	if (vmName.equalsIgnoreCase("all")) { //$NON-NLS-1$
             		Collection<VMComponentDefn> vms = config.getVMComponentDefns();
             		for (Iterator<VMComponentDefn> it=vms.iterator(); it.hasNext();) {
             			 VMComponentDefn vm = it.next();
             			 
-            			 DeployedComponent dc = this.deployeServiceDefnToVM( (VMComponentDefnID)vm.getID(), connectorBindingName, editor, principalName);
+            			 DeployedComponent dc = editor.deployServiceDefn(config, binding,  (VMComponentDefnID)vm.getID());
             		}
             		
-            	} else {
-            		// TODO:  the method from serveradminapi passes in "ALL" and its not currently
-            		// called from anywhere else
-            	}
-            	
+//            	} else {
+//            		// TODO:  the method from serveradminapi passes in "ALL" and its not currently
+//            		// called from anywhere else
+//            	}
+//            	
             }
             executeTransaction(editor.getDestination().popActions(), principalName);
 
@@ -968,8 +969,13 @@
         ConfigurationObjectEditor editor = null;
         try {
             editor = createEditor();
+            Configuration config = getNextStartupConfiguration();
+            ServiceComponentDefn scd = config.getServiceComponentDefn(serviceName);
+ 
             
-            deployComponent = deployeServiceDefnToVM(theProcessID, serviceName, editor, principalName);
+            deployComponent = editor.deployServiceDefn(config, scd,  theProcessID);
+
+            
             executeTransaction(editor.getDestination().popActions(), principalName);
         } catch (ConfigurationException theException) {
             clearActions(editor);
@@ -978,19 +984,7 @@
         return deployComponent;
     }
     
-    private DeployedComponent deployeServiceDefnToVM(VMComponentDefnID theProcessID,
-            String serviceName,
-            ConfigurationObjectEditor editor,
-            String principalName) throws ConfigurationException {
-    
-        DeployedComponent deployComponent = null;
 
-            Configuration config = getNextStartupConfiguration();
-            ServiceComponentDefn scd = config.getServiceComponentDefn(serviceName);
-            deployComponent = editor.deployServiceDefn(config, scd,  theProcessID);
- 
-        return deployComponent;
-    }
     /**
      * Check whether the encrypted properties for the specified ComponentDefns can be decrypted.
      * @param defns List<ComponentDefn>