[teiid-commits] teiid SVN: r2407 - trunk/jboss-integration/src/main/java/org/teiid/templates/connector.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2010-08-03 15:14:04 -0400 (Tue, 03 Aug 2010)
New Revision: 2407

Modified:
   trunk/jboss-integration/src/main/java/org/teiid/templates/connector/RaXmlPropertyConverter.java
Log:
TEIID-1183: The connection interface was 'Executionfactory' before the the split between the Translator & Resource Adapter. The code that gets the property metadata from RAR file is still looking for the "connection definition" under "ExecutionFactory", which is wrong. It should be looking for "javax.resource.cci.ConnectionFactory". How there is still a risk if a customer uses a different connection factory than this one to develop or use a connection factory then Teiid will not be able to create the template files correctly.

Modified: trunk/jboss-integration/src/main/java/org/teiid/templates/connector/RaXmlPropertyConverter.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/templates/connector/RaXmlPropertyConverter.java	2010-08-03 19:04:59 UTC (rev 2406)
+++ trunk/jboss-integration/src/main/java/org/teiid/templates/connector/RaXmlPropertyConverter.java	2010-08-03 19:14:04 UTC (rev 2407)
@@ -80,7 +80,9 @@
 			ObjectName on = new ObjectName("jboss.jca:service=RARDeployment,name='"+rarName+"'");//$NON-NLS-1$	//$NON-NLS-2$	
 			ConnectorMetaData obj = (ConnectorMetaData)server.getAttribute(on, "MetaData");//$NON-NLS-1$	
 			ConnectionDefinitionMetaData metadata = obj.getConnectionDefinition(ConnectionFactory.class.getName());
-			return metadata.getProperties();
+			if (metadata != null) {
+				return metadata.getProperties();
+			}
 		} catch (MalformedObjectNameException e) {
 			//ignore
 		} catch (AttributeNotFoundException e) {