[jboss-cvs] JBossAS SVN: r112500 - in projects/jboss-jca/branches/Branch_1_0: adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa and 2 other directories.

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

Author: jesper.pedersen
Date: 2011-12-01 09:51:03 -0500 (Thu, 01 Dec 2011)
New Revision: 112500

Modified:
   projects/jboss-jca/branches/Branch_1_0/adapters/src/main/java/org/jboss/jca/adapters/jdbc/local/LocalManagedConnectionFactory.java
   projects/jboss-jca/branches/Branch_1_0/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java
   projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/CoreBundle.java
   projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
Log:
Print out the MCFs for wrong allocation

Modified: projects/jboss-jca/branches/Branch_1_0/adapters/src/main/java/org/jboss/jca/adapters/jdbc/local/LocalManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/adapters/src/main/java/org/jboss/jca/adapters/jdbc/local/LocalManagedConnectionFactory.java	2011-12-01 14:48:40 UTC (rev 112499)
+++ projects/jboss-jca/branches/Branch_1_0/adapters/src/main/java/org/jboss/jca/adapters/jdbc/local/LocalManagedConnectionFactory.java	2011-12-01 14:51:03 UTC (rev 112500)
@@ -692,4 +692,22 @@
 
       return dataSource;
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public String toString()
+   {
+      StringBuilder sb = new StringBuilder();
+
+      sb.append("LocalManagedConnectionFactory@").append(Integer.toHexString(System.identityHashCode(this)));
+      sb.append("[connectionURL=").append(connectionURL);
+      sb.append(" driverClass=").append(driverClass);
+      sb.append(" userName=").append(userName);
+      sb.append(" password=****");
+      sb.append(" transactionIsolation=").append(transactionIsolation);
+      sb.append("]");
+
+      return sb.toString();
+   }
 }

Modified: projects/jboss-jca/branches/Branch_1_0/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java	2011-12-01 14:48:40 UTC (rev 112499)
+++ projects/jboss-jca/branches/Branch_1_0/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java	2011-12-01 14:51:03 UTC (rev 112500)
@@ -633,6 +633,24 @@
    }
 
    /**
+    * {@inheritDoc}
+    */
+   public String toString() 
+   {
+      StringBuilder sb = new StringBuilder();
+
+      sb.append("XAManagedConnectionFactory@").append(Integer.toHexString(System.identityHashCode(this)));
+      sb.append("[xaDataSourceClass=").append(xaDataSourceClass);
+      sb.append(" xaProps=").append(Integer.toHexString(System.identityHashCode(xaProps)));
+      sb.append(" userName=").append(userName);
+      sb.append(" password=****");
+      sb.append(" transactionIsolation=").append(transactionIsolation);
+      sb.append("]");
+
+      return sb.toString();
+   }
+ 
+   /**
     * Default implementation
     */
    public static class XADataSelector implements URLSelectorStrategy

Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/CoreBundle.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/CoreBundle.java	2011-12-01 14:48:40 UTC (rev 112499)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/CoreBundle.java	2011-12-01 14:51:03 UTC (rev 112500)
@@ -233,10 +233,12 @@
    
    /**
     * Wrong ManagedConnectionFactory sent to allocateConnection
+    * @param pool The ManagedConnectionFactory used for the pool
+    * @param mcf The ManagedConnectionFactory passed in
     * @return The value
     */
-   @Message(id = 455, value = "Wrong ManagedConnectionFactory sent to allocateConnection")
-   public String wrongManagedConnectionFactorySentToAllocateConnection();
+   @Message(id = 455, value = "Wrong ManagedConnectionFactory sent to allocateConnection (Pool=%s, MCF=%s)")
+   public String wrongManagedConnectionFactorySentToAllocateConnection(Object pool, Object mcf);
 
    /**
     * Unchecked throwable in ManagedConnection.getConnection()

Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java	2011-12-01 14:48:40 UTC (rev 112499)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java	2011-12-01 14:51:03 UTC (rev 112500)
@@ -440,7 +440,8 @@
       //it is an explicit spec requirement that equals be used for matching rather than ==.
       if (!pool.getManagedConnectionFactory().equals(mcf))
       {
-         throw new ResourceException(bundle.wrongManagedConnectionFactorySentToAllocateConnection());
+         throw new ResourceException(
+            bundle.wrongManagedConnectionFactorySentToAllocateConnection(pool.getManagedConnectionFactory(), mcf));
       }
 
       // Pick a managed connection from the pool