Repository: activemq Updated Branches: refs/heads/activemq-5.12.x 70a49b0fa -> 5488d8a03
https://issues.apache.org/jira/browse/AMQ-5968 Fixing a potential null pointer exception when attempting to use scheduler support with replicated levelDB, which is currently not supported. (cherry picked from commit 130455c925786c4bf3333e59240ff0789b9d026f) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5488d8a0 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5488d8a0 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5488d8a0 Branch: refs/heads/activemq-5.12.x Commit: 5488d8a030ca5e97ac4f4892f87ff96e5b4437d1 Parents: 70a49b0 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Mon Sep 21 17:37:02 2015 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Mon Sep 21 17:38:44 2015 +0000 ---------------------------------------------------------------------- .../org/apache/activemq/leveldb/replicated/ProxyLevelDBStore.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/5488d8a0/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ProxyLevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ProxyLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ProxyLevelDBStore.scala index efd55f3..7b62a95 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ProxyLevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ProxyLevelDBStore.scala @@ -46,7 +46,7 @@ abstract class ProxyLevelDBStore extends LockableServiceSupport with BrokerServi } def createJobSchedulerStore():JobSchedulerStore = { - return proxy_target.createJobSchedulerStore() + throw new UnsupportedOperationException(); } def setDirectory(dir: File) {
