You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2012/09/07 13:23:05 UTC

svn commit: r1381980 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc: JDBCIOExceptionHandler.java JDBCPersistenceAdapter.java

Author: dejanb
Date: Fri Sep  7 11:23:05 2012
New Revision: 1381980

URL: http://svn.apache.org/viewvc?rev=1381980&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4005 - remove deprecated API warning

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandler.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandler.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandler.java?rev=1381980&r1=1381979&r2=1381980&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandler.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandler.java Fri Sep  7 11:23:05 2012
@@ -36,7 +36,7 @@ public class JDBCIOExceptionHandler exte
         boolean hasLock = true;
         if (broker.getPersistenceAdapter() instanceof JDBCPersistenceAdapter) {
             JDBCPersistenceAdapter jdbcPersistenceAdapter = (JDBCPersistenceAdapter) broker.getPersistenceAdapter();
-            Locker locker = jdbcPersistenceAdapter.getDatabaseLocker();
+            Locker locker = jdbcPersistenceAdapter.getLocker();
             if (locker != null) {
                 try {
                     if (!locker.keepAlive()) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java?rev=1381980&r1=1381979&r2=1381980&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java Fri Sep  7 11:23:05 2012
@@ -301,7 +301,7 @@ public class JDBCPersistenceAdapter exte
         }
 
         if (isUseDatabaseLock()) {
-            Locker service = getDatabaseLocker();
+            Locker service = getLocker();
             if (service == null) {
                 LOG.warn("No databaseLocker configured for the JDBC Persistence Adapter");
             } else {