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 #1135

This commit is contained in:
Timothy Bish 2017-03-27 12:30:25 -04:00
parent 07f7916ed3 af0be518e1
commit 78d0193fca
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
View File

@ -143,10 +143,6 @@ public class AMQPConnectionContext extends ProtonInitializable {
handler.flush(); handler.flush();
} }
public void flush(boolean wait) {
handler.flush(wait);
}
public void close(ErrorCondition errorCondition) { public void close(ErrorCondition errorCondition) {
handler.close(errorCondition); handler.close(errorCondition);
} }

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

@ -56,12 +56,7 @@ public class ProtonHandler extends ProtonInitializable {
private final Executor dispatchExecutor; private final Executor dispatchExecutor;
private final Runnable dispatchRunnable = new Runnable() { private final Runnable dispatchRunnable = () -> dispatch();
@Override
public void run() {
dispatch();
}
};
private ArrayList<EventHandler> handlers = new ArrayList<>(); private ArrayList<EventHandler> handlers = new ArrayList<>();
@ -251,22 +246,12 @@ public class ProtonHandler extends ProtonInitializable {
} }
public void flush() { public void flush() {
flush(false);
}
public void flush(boolean wait) {
synchronized (lock) { synchronized (lock) {
transport.process(); transport.process();
checkServerSASL(); checkServerSASL();
} }
if (wait) { dispatchExecutor.execute(dispatchRunnable);
dispatch();
} else {
dispatchExecutor.execute(dispatchRunnable);
}
} }
public void close(ErrorCondition errorCondition) { public void close(ErrorCondition errorCondition) {
@ -276,7 +261,8 @@ public class ProtonHandler extends ProtonInitializable {
} }
connection.close(); connection.close();
} }
flush(true);
flush();
} }
protected void checkServerSASL() { protected void checkServerSASL() {