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

This closes #1140

This commit is contained in:
Justin Bertram 2017-03-27 22:01:36 -05:00
parent feadb6338c dce59d5436
commit 5843354168
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
View File

@ -164,7 +164,7 @@ public class ProtonHandler extends ProtonInitializable {
capacity = transport.capacity();
}
} catch (Throwable e) {
log.debug(e.getMessage(), e);
log.warn(e.getMessage(), e);
}
receivedFirstPacket = true;
@ -296,20 +296,6 @@ public class ProtonHandler extends ProtonInitializable {
}
}
private Event popEvent() {
synchronized (lock) {
Event ev = collector.peek();
if (ev != null) {
// pop will invalidate the event
// for that reason we make a new one
// Events are reused inside the collector, so we need to make a new one here
ev = ev.copy();
collector.pop();
}
return ev;
}
}
private void dispatchAuth(boolean sasl) {
for (EventHandler h : handlers) {
h.onAuthInit(this, getConnection(), sasl);
@ -322,17 +308,22 @@ public class ProtonHandler extends ProtonInitializable {
// because we could have a distributed deadlock
// while processing events (for instance onTransport)
// while a client is also trying to write here
while ((ev = popEvent()) != null) {
for (EventHandler h : handlers) {
if (log.isTraceEnabled()) {
log.trace("Handling " + ev + " towards " + h);
}
try {
Events.dispatch(ev, h);
} catch (Exception e) {
log.warn(e.getMessage(), e);
connection.setCondition(new ErrorCondition());
synchronized (lock) {
while ((ev = collector.peek()) != null) {
for (EventHandler h : handlers) {
if (log.isTraceEnabled()) {
log.trace("Handling " + ev + " towards " + h);
}
try {
Events.dispatch(ev, h);
} catch (Exception e) {
log.warn(e.getMessage(), e);
connection.setCondition(new ErrorCondition());
}
}
collector.pop();
}
}