[jboss-cvs] JBossAS SVN: r104475 - in projects/jboss-jca/trunk: deployers/src/test/java/org/jboss/jca/deployers/fungal and 1 other directory.

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

Author: jesper.pedersen
Date: 2010-05-05 09:03:01 -0400 (Wed, 05 May 2010)
New Revision: 104475

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
   projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/fungal/RADeployerTestCase.java
Log:
Guard null cached connection manager

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java	2010-05-05 13:01:37 UTC (rev 104474)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java	2010-05-05 13:03:01 UTC (rev 104475)
@@ -55,14 +55,17 @@
     */
    public void connectionClosed(ConnectionEvent ce)
    {
-      try
+      if (getCachedConnectionManager() != null)
       {
-         getCachedConnectionManager().unregisterConnection(getConnectionManager(), ce.getConnectionHandle());
+         try
+         {
+            getCachedConnectionManager().unregisterConnection(getConnectionManager(), ce.getConnectionHandle());
+         }
+         catch (Throwable t)
+         {
+            getLog().info("Throwable from unregisterConnection", t);
+         }
       }
-      catch (Throwable t)
-      {
-         getLog().info("Throwable from unregisterConnection", t);
-      }
 
       getConnectionManager().unregisterAssociation(this, ce.getConnectionHandle());
       

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java	2010-05-05 13:01:37 UTC (rev 104474)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java	2010-05-05 13:03:01 UTC (rev 104475)
@@ -313,14 +313,19 @@
       if (this.getManagedConnection() != (ManagedConnection)ce.getSource())
          throw new IllegalArgumentException("ConnectionClosed event received from wrong ManagedConnection! Expected: " +
                this.getManagedConnection() + ", actual: " + ce.getSource());
-      try
+
+      if (getCachedConnectionManager() != null)
       {
-         this.getCachedConnectionManager().unregisterConnection(this.getConnectionManager(), ce.getConnectionHandle());
+         try
+         {
+            this.getCachedConnectionManager().unregisterConnection(this.getConnectionManager(), 
+                                                                   ce.getConnectionHandle());
+         }
+         catch (Throwable t)
+         {
+            getLog().info("throwable from unregister connection", t);
+         }
       }
-      catch (Throwable t)
-      {
-         getLog().info("throwable from unregister connection", t);
-      }
 
       try
       {

Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/fungal/RADeployerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/fungal/RADeployerTestCase.java	2010-05-05 13:01:37 UTC (rev 104474)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/fungal/RADeployerTestCase.java	2010-05-05 13:03:01 UTC (rev 104475)
@@ -21,23 +21,26 @@
  */
 package org.jboss.jca.deployers.fungal;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.mock;
+import org.jboss.jca.validator.Failure;
+import org.jboss.jca.validator.FailureHelper;
+import org.jboss.jca.validator.Severity;
+import org.jboss.jca.validator.Validator;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ResourceBundle;
-import org.jboss.jca.validator.Failure;
-import org.jboss.jca.validator.FailureHelper;
-import org.jboss.jca.validator.Severity;
-import org.jboss.jca.validator.Validator;
+
 import org.junit.Test;
 
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.mock;
+
 /**
  * @author <a href="mailto:stefano.maestri at javalinux.it">Stefano Maestri</a>
  *