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

Fix for https://issues.apache.org/activemq/browse/AMQ-1702 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@652302 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2008-04-30 06:48:20 +00:00
parent 9341f16442
commit b35bc797ec
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@ public class DefaultDatabaseLocker implements DatabaseLocker {
private final Statements statements; private final Statements statements;
private long sleepTime = 1000; private long sleepTime = 1000;
private Connection connection; private Connection connection;
private PreparedStatement statement;
private boolean stopping; private boolean stopping;
public DefaultDatabaseLocker(DataSource dataSource, Statements statements) { public DefaultDatabaseLocker(DataSource dataSource, Statements statements) {
@ -49,7 +48,7 @@ public class DefaultDatabaseLocker implements DatabaseLocker {
stopping = false; stopping = false;
LOG.info("Attempting to acquire the exclusive lock to become the Master broker"); LOG.info("Attempting to acquire the exclusive lock to become the Master broker");
PreparedStatement statement = null;
while (true) { while (true) {
try { try {
connection = dataSource.getConnection(); connection = dataSource.getConnection();
@ -97,16 +96,26 @@ public class DefaultDatabaseLocker implements DatabaseLocker {
} }
public boolean keepAlive() { public boolean keepAlive() {
PreparedStatement statement = null;
boolean result = false;
try { try {
PreparedStatement statement = connection.prepareStatement(statements.getLockUpdateStatement()); statement = connection.prepareStatement(statements.getLockUpdateStatement());
statement.setLong(1, System.currentTimeMillis()); statement.setLong(1, System.currentTimeMillis());
int rows = statement.executeUpdate(); int rows = statement.executeUpdate();
if (rows == 1) { if (rows == 1) {
return true; result=true;
} }
} catch (Exception e) { } catch (Exception e) {
LOG.error("Failed to update database lock: " + e, e); LOG.error("Failed to update database lock: " + e, e);
} }finally {
return false; if (statement != null) {
try {
statement.close();
} catch (SQLException e) {
LOG.error("Failed to close statement",e);
}
}
}
return result;
} }
} }