HHH-3006 : occansional infinite loop on JTA tx-timeout
git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@14788 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
parent
e3b572f2ee
commit
4bf13b7e9b
|
@ -8,6 +8,7 @@ import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
import java.util.ConcurrentModificationException;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
@ -296,7 +297,9 @@ public abstract class AbstractBatcher implements Batcher {
|
||||||
releasing = true;
|
releasing = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (batchUpdate!=null) batchUpdate.close();
|
if ( batchUpdate != null ) {
|
||||||
|
batchUpdate.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch ( SQLException sqle ) {
|
catch ( SQLException sqle ) {
|
||||||
//no big deal
|
//no big deal
|
||||||
|
@ -315,8 +318,23 @@ public abstract class AbstractBatcher implements Batcher {
|
||||||
// no big deal
|
// no big deal
|
||||||
log.warn( "Could not close a JDBC result set", e );
|
log.warn( "Could not close a JDBC result set", e );
|
||||||
}
|
}
|
||||||
|
catch ( ConcurrentModificationException e ) {
|
||||||
|
// this has been shown to happen occasionally in rare cases
|
||||||
|
// when using a transaction manager + transaction-timeout
|
||||||
|
// where the timeout calls back through Hibernate's
|
||||||
|
// registered transaction synchronization on a separate
|
||||||
|
// "reaping" thread. In cases where that reaping thread
|
||||||
|
// executes through this block at the same time the main
|
||||||
|
// application thread does we can get into situations where
|
||||||
|
// these CMEs occur. And though it is not "allowed" per-se,
|
||||||
|
// the end result without handling it specifically is infinite
|
||||||
|
// looping. So here, we simply break the loop
|
||||||
|
log.info( "encountered CME attempting to release batcher; assuming cause is tx-timeout scenario and ignoring" );
|
||||||
|
break;
|
||||||
|
}
|
||||||
catch ( Throwable e ) {
|
catch ( Throwable e ) {
|
||||||
// sybase driver (jConnect) throwing NPE here in certain cases
|
// sybase driver (jConnect) throwing NPE here in certain
|
||||||
|
// cases, but we'll just handle the general "unexpected" case
|
||||||
log.warn( "Could not close a JDBC result set", e );
|
log.warn( "Could not close a JDBC result set", e );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -327,6 +345,11 @@ public abstract class AbstractBatcher implements Batcher {
|
||||||
try {
|
try {
|
||||||
closeQueryStatement( ( PreparedStatement ) iter.next() );
|
closeQueryStatement( ( PreparedStatement ) iter.next() );
|
||||||
}
|
}
|
||||||
|
catch ( ConcurrentModificationException e ) {
|
||||||
|
// see explanation above...
|
||||||
|
log.info( "encountered CME attempting to release batcher; assuming cause is tx-timeout scenario and ignoring" );
|
||||||
|
break;
|
||||||
|
}
|
||||||
catch ( SQLException e ) {
|
catch ( SQLException e ) {
|
||||||
// no big deal
|
// no big deal
|
||||||
log.warn( "Could not close a JDBC statement", e );
|
log.warn( "Could not close a JDBC statement", e );
|
||||||
|
|
Loading…
Reference in New Issue