[jboss-cvs] JBossAS SVN: r112398 - in branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc: local and 1 other directories.

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

Author: jesper.pedersen
Date: 2011-11-02 10:00:05 -0400 (Wed, 02 Nov 2011)
New Revision: 112398

Modified:
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java
   branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java
Log:
[JBPAPP-7464] Deadlock in XAManagedConnectionFactory.equals()

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2011-11-01 20:35:00 UTC (rev 112397)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java	2011-11-02 14:00:05 UTC (rev 112398)
@@ -491,7 +491,7 @@
     * <p>In fact, we have a problem here. Theoretically, there is a possible
     * name collision between config properties and "user"/"password".
     */
-   protected Properties getConnectionProperties(Subject subject, ConnectionRequestInfo cri)
+   protected synchronized Properties getConnectionProperties(Subject subject, ConnectionRequestInfo cri)
       throws ResourceException
    {
       if (cri != null && cri.getClass() != WrappedConnectionRequestInfo.class)

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java	2011-11-01 20:35:00 UTC (rev 112397)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java	2011-11-02 14:00:05 UTC (rev 112398)
@@ -165,7 +165,7 @@
       }
    }
 
-   public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri)
+   public synchronized ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri)
          throws javax.resource.ResourceException
    {
       Properties props = getConnectionProperties(subject, cri);

Modified: branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java
===================================================================
--- branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java	2011-11-01 20:35:00 UTC (rev 112397)
+++ branches/JBPAPP_5_1/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java	2011-11-02 14:00:05 UTC (rev 112398)
@@ -410,7 +410,7 @@
       this.isSameRMOverrideValue = isSameRMOverrideValue;
    }
 
-   public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri)
+   public synchronized ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri)
    		throws javax.resource.ResourceException
    {	   
 	   if(xadsSelector == null)