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

ARTEMIS-892 - add lock to tick method 

https://issues.apache.org/jira/browse/ARTEMIS-892
(cherry picked from commit 198143edd0)
This commit is contained in:
Andy Taylor 2016-12-16 12:11:40 +00:00 committed by Clebert Suconic
parent 99a62f75f2
commit 6d022d035e
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,22 +91,24 @@ public class ProtonHandler extends ProtonInitializable {
}
public long tick(boolean firstTick) {
if (!firstTick) {
try {
if (connection.getLocalState() != EndpointState.CLOSED) {
long rescheduleAt = transport.tick(TimeUnit.NANOSECONDS.toMillis(System.nanoTime()));
if (transport.isClosed()) {
throw new IllegalStateException("Channel was inactive for to long");
synchronized (lock) {
if (!firstTick) {
try {
if (connection.getLocalState() != EndpointState.CLOSED) {
long rescheduleAt = transport.tick(TimeUnit.NANOSECONDS.toMillis(System.nanoTime()));
if (transport.isClosed()) {
throw new IllegalStateException("Channel was inactive for to long");
}
return rescheduleAt;
}
return rescheduleAt;
} catch (Exception e) {
transport.close();
connection.setCondition(new ErrorCondition());
}
} catch (Exception e) {
transport.close();
connection.setCondition(new ErrorCondition());
return 0;
}
return 0;
return transport.tick(TimeUnit.NANOSECONDS.toMillis(System.nanoTime()));
}
return transport.tick(TimeUnit.NANOSECONDS.toMillis(System.nanoTime()));
}
public int capacity() {