[jboss-svn-commits] JBL Code SVN: r5807 - labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions

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

Author: estebanschifman
Date: 2006-08-11 17:50:06 -0400 (Fri, 11 Aug 2006)
New Revision: 5807

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSqlRowAction.java
Log:
call cleanup() also when processCurrentObject() was not invoked

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSqlRowAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSqlRowAction.java	2006-08-11 21:45:34 UTC (rev 5806)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSqlRowAction.java	2006-08-11 21:50:06 UTC (rev 5807)
@@ -93,6 +93,7 @@
 	  		if (! changeStatus(ROW_STATE.Pending,ROW_STATE.Working))
 	  		{	m_oLogger.warn("Unable to change status to Working");
 	  			m_oConn.rollback();
+	  			cleanup();
 	  			return;
 	  		}
 	 		m_oConn.commit();			
@@ -121,14 +122,16 @@
 			}
 			GpListener.notifyError(m_oParms,e,getErrorNotification());
 		}
-		finally 
-		{	setChanged();
-			notifyObservers(new Integer(-1));
-			if (null!=m_oConn)
-			{	try	{	m_oConn.rollback(); }
-				catch(Exception e)	{ /* OK just continue */ }
-				m_oConn.release();
-			}
+		finally { cleanup(); }
+	} //________________________________
+	
+	private void cleanup()
+	{	setChanged();
+		notifyObservers(new Integer(-1));
+		if (null!=m_oConn)
+		{	try	{	m_oConn.rollback(); }
+			catch(Exception e)	{ /* OK just continue */ }
+			m_oConn.release();
 		}
 	} //________________________________