You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2013/10/01 14:02:31 UTC
[1/2] git commit: https://issues.apache.org/jira/browse/AMQ-4682 -
add original lastupdate time to info message
Updated Branches:
refs/heads/trunk 2a5ad365d -> 8550f9303
https://issues.apache.org/jira/browse/AMQ-4682 - add original lastupdate time to info message
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8550f930
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8550f930
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8550f930
Branch: refs/heads/trunk
Commit: 8550f93031b93fc10a536f162ab606bc4346b1b1
Parents: 45e7d3a
Author: gtully <ga...@gmail.com>
Authored: Tue Oct 1 13:01:35 2013 +0100
Committer: gtully <ga...@gmail.com>
Committed: Tue Oct 1 13:02:17 2013 +0100
----------------------------------------------------------------------
.../org/apache/activemq/plugin/RuntimeConfigurationBroker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/8550f930/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java b/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
index bd2d652..e39e0cb 100644
--- a/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
+++ b/activemq-runtime-config/src/main/java/org/apache/activemq/plugin/RuntimeConfigurationBroker.java
@@ -227,7 +227,7 @@ public class RuntimeConfigurationBroker extends BrokerFilter {
};
if (lastModified > 0 && checkPeriod > 0) {
this.getBrokerService().getScheduler().executePeriodically(monitorTask, checkPeriod);
- info("Monitoring for updates (every " + checkPeriod + "millis) : " + configToMonitor);
+ info("Monitoring for updates (every " + checkPeriod + "millis) : " + configToMonitor + ", lastUpdate: " + new Date(lastModified));
}
}
[2/2] git commit: https://issues.apache.org/jira/browse/AMQ-4365 -
fix up LeaseDatabaseLockerTest config, needs a lockable instance
Posted by gt...@apache.org.
https://issues.apache.org/jira/browse/AMQ-4365 - fix up LeaseDatabaseLockerTest config, needs a lockable instance
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/45e7d3a2
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/45e7d3a2
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/45e7d3a2
Branch: refs/heads/trunk
Commit: 45e7d3a21b4f944df9f2824f58fd135dd326ee59
Parents: 2a5ad36
Author: gtully <ga...@gmail.com>
Authored: Tue Oct 1 13:00:40 2013 +0100
Committer: gtully <ga...@gmail.com>
Committed: Tue Oct 1 13:02:17 2013 +0100
----------------------------------------------------------------------
.../apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/45e7d3a2/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
index be08439..b499611 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java
@@ -70,11 +70,11 @@ public class LeaseDatabaseLockerTest {
LeaseDatabaseLocker lockerA = new LeaseDatabaseLocker();
lockerA.setLeaseHolderId("First");
- lockerA.configure(jdbc);
+ jdbc.setLocker(lockerA);
final LeaseDatabaseLocker lockerB = new LeaseDatabaseLocker();
lockerB.setLeaseHolderId("Second");
- lockerB.configure(jdbc);
+ jdbc.setLocker(lockerB);
final AtomicBoolean blocked = new AtomicBoolean(true);
final Connection connection = dataSource.getConnection();
@@ -141,11 +141,11 @@ public class LeaseDatabaseLockerTest {
final LeaseDatabaseLocker lockerA = new LeaseDatabaseLocker();
lockerA.setLeaseHolderId("A");
- lockerA.configure(jdbc);
+ jdbc.setLocker(lockerA);
final LeaseDatabaseLocker lockerB = new LeaseDatabaseLocker();
lockerB.setLeaseHolderId("B");
- lockerB.configure(jdbc);
+ jdbc.setLocker(lockerB);
final Set<LeaseDatabaseLocker> lockedSet = new HashSet<LeaseDatabaseLocker>();
ExecutorService executor = Executors.newCachedThreadPool();
@@ -259,6 +259,7 @@ public class LeaseDatabaseLockerTest {
}});
underTest.configure(jdbcPersistenceAdapter);
+ underTest.setLockable(jdbcPersistenceAdapter);
return underTest.determineTimeDifference(connection);
}