[jboss-cvs] JBossAS SVN: r101080 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal.

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

Author: smarlow at redhat.com
Date: 2010-02-17 11:15:09 -0500 (Wed, 17 Feb 2010)
New Revision: 101080

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
more code cleanup after review

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-02-17 16:14:20 UTC (rev 101079)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-02-17 16:15:09 UTC (rev 101080)
@@ -379,8 +379,6 @@
                         beanValidationObjects.add(mcf);
                         associationObjects.add(mcf);
 
-                        ConnectionFactoryBuilder cfb = getConnectionFactoryBuilder();
-
                         // ConnectionFactory
                         Object cf = mcf.createConnectionFactory(new NoTxConnectionManager());
 
@@ -402,8 +400,7 @@
 
                               String jndiName = f.getName().substring(0, f.getName().indexOf(".rar"));
 
-                              cfb.setManagedConnectionFactory(mcf).setConnectionFactory(cf).setName(jndiName);
-                              bindConnectionFactory(jndiName, (Serializable)cf, cfb);
+                              bindConnectionFactory(jndiName, (Serializable)cf, mcf);
                               jndiNames.add(JNDI_PREFIX + jndiName);
                            }
                            else
@@ -745,10 +742,13 @@
     * Bind connection factory into JNDI
     * @param name The JNDI name
     * @param cf The connection factory
+    * @param mcf The managed connection factory
     * @exception Exception thrown if an error occurs
     */
-   private void bindConnectionFactory(String name, Serializable cf, ConnectionFactoryBuilder cfb) throws Exception
+   private void bindConnectionFactory(String name, Serializable cf, ManagedConnectionFactory mcf) throws Exception
    {
+      ConnectionFactoryBuilder cfb = getConnectionFactoryBuilder();
+      cfb.setManagedConnectionFactory(mcf).setConnectionFactory(cf).setName(name);
       Context context = new InitialContext();
       try
       {