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

Avoid logging error messages when an AMQP client gracefully disconnects. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437550 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2013-01-23 16:36:37 +00:00
parent 3602973cae
commit 0dfa5f483c
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
View File

@ -270,11 +270,13 @@ class AmqpProtocolConverter {
public void onAMQPException(IOException error) { public void onAMQPException(IOException error) {
closedSocket = true; closedSocket = true;
if( !closing) { if( !closing ) {
System.out.println("AMQP client disconnected"); amqpTransport.sendToActiveMQ(error);
error.printStackTrace();
} else { } else {
doClose(); try {
amqpTransport.stop();
} catch (Exception ignore) {
}
} }
} }

2
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransport.java
View File

@ -29,6 +29,8 @@ public interface AmqpTransport {
public void sendToActiveMQ(Command command); public void sendToActiveMQ(Command command);
public void sendToActiveMQ(IOException command);
public void sendToAmqp(Object command) throws IOException; public void sendToAmqp(Object command) throws IOException;
public X509Certificate[] getPeerCertificates(); public X509Certificate[] getPeerCertificates();

6
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpTransportFilter.java
View File

@ -72,16 +72,16 @@ public class AmqpTransportFilter extends TransportFilter implements AmqpTranspor
@Override @Override
public void onException(IOException error) { public void onException(IOException error) {
try {
protocolConverter.lock.lock(); protocolConverter.lock.lock();
try { try {
protocolConverter.onAMQPException(error); protocolConverter.onAMQPException(error);
} finally { } finally {
protocolConverter.lock.unlock(); protocolConverter.lock.unlock();
} }
} finally {
super.onException(error);
} }
public void sendToActiveMQ(IOException error) {
super.onException(error);
} }
public void onCommand(Object command) { public void onCommand(Object command) {