[jboss-cvs] JBossAS SVN: r114844 - in branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc: vendor and 1 other directory.

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

Author: jolee
Date: 2015-10-29 16:53:30 -0400 (Thu, 29 Oct 2015)
New Revision: 114844

Modified:
   branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
   branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java
   branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/DB2ExceptionSorter.java
Log:
addition of -99999 as a FATAL exception to the DB2ExceptionSorter and JBJCA-1297 changes

Modified: branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
===================================================================
--- branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java	2015-10-20 18:33:15 UTC (rev 114843)
+++ branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java	2015-10-29 20:53:30 UTC (rev 114844)
@@ -1,4 +1,4 @@
-/*
+/**
  * JBoss, Home of Professional Open Source.
  * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
@@ -698,8 +698,8 @@
    {
       synchronized (stateLock)
       {
+         con.setTransactionIsolation(jdbcTransactionIsolation);
          this.jdbcTransactionIsolation = isolationLevel;
-         con.setTransactionIsolation(jdbcTransactionIsolation);
       }
    }
 

Modified: branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java
===================================================================
--- branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java	2015-10-20 18:33:15 UTC (rev 114843)
+++ branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/WrappedConnection.java	2015-10-29 20:53:30 UTC (rev 114844)
@@ -502,6 +502,10 @@
          checkTransaction();
          mc.jdbcCommit();
       }
+      catch (Throwable t)
+      {
+         throw checkException(t);
+      }
       finally
       {
          unlock();
@@ -516,6 +520,10 @@
          checkTransaction();
          mc.jdbcRollback();
       }
+      catch (Throwable t)
+      {
+         throw checkException(t);
+      }      
       finally
       {
          unlock();
@@ -530,6 +538,10 @@
          checkTransaction();
          mc.jdbcRollback(savepoint);
       }
+      catch (Throwable t)
+      {
+         throw checkException(t);
+      }      
       finally
       {
          unlock();
@@ -607,6 +619,10 @@
          checkStatus();
          mc.setJdbcTransactionIsolation(isolationLevel);
       }
+      catch (Throwable t)
+      {
+         throw checkException(t);
+      }
       finally
       {
          unlock();
@@ -621,6 +637,10 @@
          checkStatus();
          return mc.getJdbcTransactionIsolation();
       }
+      catch (Throwable t)
+      {
+         throw checkException(t);
+      }      
       finally
       {
          unlock();

Modified: branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/DB2ExceptionSorter.java
===================================================================
--- branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/DB2ExceptionSorter.java	2015-10-20 18:33:15 UTC (rev 114843)
+++ branches/JBPAPP_5_2_0_GA-JBPAPP-11232/connector/src/main/org/jboss/resource/adapter/jdbc/vendor/DB2ExceptionSorter.java	2015-10-29 20:53:30 UTC (rev 114844)
@@ -42,10 +42,7 @@
    
    /** The logger */
    private static final Logger logger = Logger.getLogger(DB2ExceptionSorter.class);
-   
-   /** The trace */
-   private static final boolean trace = logger.isTraceEnabled();
-   
+      
    /** The serialVersionUID */
    private static final long serialVersionUID = -4724550353693159378L;
 
@@ -63,15 +60,15 @@
       {
          isFatal = true;
       }
-      
-      if(trace)
+      else if (code == 99999)  //treating all -99999 codes as FATAL
       {
-         logger.trace("Evaluated SQL error code " + code + " isException returned " + isFatal);       
+         isFatal = true;
       }
       
+      logger.trace("Evaluated SQL error code " + code + " isException returned " + isFatal);       
+      
       return isFatal;
       
-   }
-    
+   }   
    
 }