Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-06 18:18:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6150

Browse Source 
merging patch to fix casting issues

Thanks for Marc Breslow for the patch

This closes #166
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-02-01 12:58:17 +00:00
commit 9361bc6a0f
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
View File

@ -108,12 +108,8 @@ public class MemoryMessageStore extends AbstractMessageStore {
// here // here
synchronized (messageTable) { synchronized (messageTable) {
for (Iterator<Message> iter = messageTable.values().iterator(); iter.hasNext();) { for (Iterator<Message> iter = messageTable.values().iterator(); iter.hasNext();) {
Object msg = iter.next(); Message msg = iter.next();
if (msg.getClass() == MessageId.class) { listener.recoverMessage(msg);
listener.recoverMessageReference((MessageId)msg);
} else {
listener.recoverMessage((Message)msg);
}
} }
} }
} }

18
activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicSub.java
View File

@ -72,12 +72,8 @@ class MemoryTopicSub {
synchronized void recoverSubscription(MessageRecoveryListener listener) throws Exception { synchronized void recoverSubscription(MessageRecoveryListener listener) throws Exception {
for (Iterator<Entry<MessageId, Message>> iter = map.entrySet().iterator(); iter.hasNext();) { for (Iterator<Entry<MessageId, Message>> iter = map.entrySet().iterator(); iter.hasNext();) {
Entry<MessageId, Message> entry = iter.next(); Entry<MessageId, Message> entry = iter.next();
Object msg = entry.getValue(); Message msg = entry.getValue();
if (msg.getClass() == MessageId.class) { listener.recoverMessage(msg);
listener.recoverMessageReference((MessageId)msg);
} else {
listener.recoverMessage((Message)msg);
}
} }
} }
@ -91,13 +87,9 @@ class MemoryTopicSub {
Entry<MessageId, Message> entry = iter.next(); Entry<MessageId, Message> entry = iter.next();
if (pastLackBatch) { if (pastLackBatch) {
count++; count++;
Object msg = entry.getValue(); Message msg = entry.getValue();
lastId = (MessageId)entry.getKey(); lastId = entry.getKey();
if (msg.getClass() == MessageId.class) { listener.recoverMessage(msg);
listener.recoverMessageReference((MessageId)msg);
} else {
listener.recoverMessage((Message)msg);
}
} else { } else {
pastLackBatch = entry.getKey().equals(lastBatch); pastLackBatch = entry.getKey().equals(lastBatch);
} }

4
activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java
View File

@ -265,10 +265,6 @@ public class ServerSessionPoolImpl implements ServerSessionPool {
ActiveMQSession session = null; ActiveMQSession session = null;
if (s instanceof ActiveMQSession) { if (s instanceof ActiveMQSession) {
session = (ActiveMQSession) s; session = (ActiveMQSession) s;
} else if (s instanceof ActiveMQQueueSession) {
session = (ActiveMQSession) s;
} else if (s instanceof ActiveMQTopicSession) {
session = (ActiveMQSession) s;
} else { } else {
activeMQAsfEndpointWorker.getConnection() activeMQAsfEndpointWorker.getConnection()
.onAsyncException(new JMSException( .onAsyncException(new JMSException(