Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-1972 - Fix for leaking connections 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@811069 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bruce Snyder 2009-09-03 18:28:41 +00:00
parent 8f9ecf0aaa
commit 87589d787f
1 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
activemq-core/src/main/java/org/apache/activemq/store/jdbc/DefaultDatabaseLocker.java
View File

@ -70,23 +70,43 @@ public class DefaultDatabaseLocker implements DatabaseLocker {
statement.execute();
break;
} catch (Exception e) {
if (stopping) {
throw new Exception("Cannot start broker as being asked to shut down. Interrupted attempt to acquire lock: " + e, e);
}
if (exceptionHandler != null) {
try {
exceptionHandler.handle(e);
} catch (Throwable handlerException) {
LOG.error("The exception handler " + exceptionHandler.getClass().getCanonicalName() + " threw this exception: " + handlerException
+ " while trying to handle this excpetion: " + e, handlerException);
try {
if (stopping) {
throw new Exception(
"Cannot start broker as being asked to shut down. "
+ "Interrupted attempt to acquire lock: "
+ e, e);
}
if (exceptionHandler != null) {
try {
exceptionHandler.handle(e);
} catch (Throwable handlerException) {
LOG.error( "The exception handler "
+ exceptionHandler.getClass().getCanonicalName()
+ " threw this exception: "
+ handlerException
+ " while trying to handle this excpetion: "
+ e, handlerException);
}
} else {
LOG.error("Failed to acquire lock: " + e, e);
} else {
LOG.error("Failed to acquire lock: " + e, e);
}
} finally {
// Let's make sure the database connection is properly
// closed when an error occurs so that we're not leaking
// connections
if (null != connection) {
try {
connection.close();
} catch (SQLException e1) {
LOG.error("Caught exception while closing connection: " + e1, e1);
}
connection = null;
}
}
} finally {
if (null != statement) {
try {
statement.close();
@ -99,9 +119,9 @@ public class DefaultDatabaseLocker implements DatabaseLocker {
LOG.debug("Sleeping for " + lockAcquireSleepInterval + " milli(s) before trying again to get the lock...");
try {
Thread.sleep(lockAcquireSleepInterval);
Thread.sleep(lockAcquireSleepInterval);
} catch (InterruptedException ie) {
LOG.warn("Master lock retry sleep interrupted", ie);
LOG.warn("Master lock retry sleep interrupted", ie);
}
}
@ -162,11 +182,11 @@ public class DefaultDatabaseLocker implements DatabaseLocker {
}
public Handler getExceptionHandler() {
return exceptionHandler;
}
return exceptionHandler;
}
public void setExceptionHandler(Handler exceptionHandler) {
this.exceptionHandler = exceptionHandler;
}
public void setExceptionHandler(Handler exceptionHandler) {
this.exceptionHandler = exceptionHandler;
}
}