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

ARTEMIS-474 another fix on JChannelWrapper

This commit is contained in:
Clebert Suconic 2016-04-14 21:33:55 -04:00
parent a3ae2c4ad2
commit ec73961f72
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
View File

@ -47,13 +47,18 @@ public class JChannelWrapper {
this.manager = manager; this.manager = manager;
if (channel.getReceiver() != null) { if (isTrace && channel.getReceiver() != null) {
logger.warn("The channel already had a receiver previously!!!!", new Exception("trace")); logger.trace(this + "The channel already had a receiver previously!!!! == " + channel.getReceiver(), new Exception("trace"));
} }
//we always add this for the first ref count //we always add this for the first ref count
channel.setReceiver(new ReceiverAdapter() { channel.setReceiver(new ReceiverAdapter() {
@Override
public String toString() {
return "ReceiverAdapter::" + JChannelWrapper.this;
}
@Override @Override
public void receive(org.jgroups.Message msg) { public void receive(org.jgroups.Message msg) {
if (isTrace) { if (isTrace) {
@ -85,8 +90,8 @@ public class JChannelWrapper {
channel.setReceiver(null); channel.setReceiver(null);
logger.trace(this + "::Closing Channel: " + channelName, new Exception("Trace")); logger.trace(this + "::Closing Channel: " + channelName, new Exception("Trace"));
channel.close(); channel.close();
manager.removeChannel(channelName);
} }
manager.removeChannel(channelName);
} }
} }

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
View File

@ -637,7 +637,7 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
Journal journalToUse = getJournal(packet.getJournalID()); Journal journalToUse = getJournal(packet.getJournalID());
if (packet.getRecord() == ADD_OPERATION_TYPE.UPDATE) { if (packet.getRecord() == ADD_OPERATION_TYPE.UPDATE) {
if (isTrace) { if (isTrace) {
logger.trace("Endpoint appendUpdate id = " + packet.getId()); logger.trace("Endpoint appendUpdate id = " + packet.getId());
} }
journalToUse.appendUpdateRecord(packet.getId(), packet.getJournalRecordType(), packet.getRecordData(), noSync); journalToUse.appendUpdateRecord(packet.getId(), packet.getJournalRecordType(), packet.getRecordData(), noSync);
} }