You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/08/15 14:52:53 UTC
svn commit: r1618168 - in /qpid/trunk/qpid/java:
amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/
amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/
Author: rgodfrey
Date: Fri Aug 15 12:52:53 2014
New Revision: 1618168
URL: http://svn.apache.org/r1618168
Log:
QPID-6004 : [Java AMQP 1.0 Client] Improve error message propagation
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java
qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java?rev=1618168&r1=1618167&r2=1618168&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java Fri Aug 15 12:52:53 2014
@@ -173,7 +173,10 @@ public class MessageConsumerImpl impleme
}
else
{
- throw new JMSException(e.getMessage(), error.getCondition().getValue().toString());
+ JMSException jmsException =
+ new JMSException(e.getMessage(), error.getCondition().getValue().toString());
+ jmsException.initCause(e);
+ throw jmsException;
}
}
Modified: qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java?rev=1618168&r1=1618167&r2=1618168&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/ConnectionErrorException.java Fri Aug 15 12:52:53 2014
@@ -34,7 +34,7 @@ public class ConnectionErrorException ex
public ConnectionErrorException(Error remoteError)
{
- super(remoteError.getDescription());
+ super(remoteError.getDescription() == null ? remoteError.toString() : remoteError.getDescription());
_remoteError = remoteError;
}
Modified: qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java?rev=1618168&r1=1618167&r2=1618168&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java Fri Aug 15 12:52:53 2014
@@ -194,9 +194,14 @@ public class Receiver implements Deliver
}
catch (InterruptedException e)
{
- throw new ConnectionErrorException(AmqpError.INTERNAL_ERROR,"Interrupted whil waiting for detach following failed attach");
+ throw new ConnectionErrorException(AmqpError.INTERNAL_ERROR,"Interrupted while waiting for detach following failed attach");
}
- throw new ConnectionErrorException(getError());
+ throw new ConnectionErrorException(getError().getCondition(),
+ getError().getDescription() == null
+ ? "AMQP error: '" + getError().getCondition().toString()
+ + "' when attempting to create a receiver"
+ + (source != null ? " from: '" + source.getAddress() +"'" : "")
+ : getError().getDescription());
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org