Author: philharveyonline Date: Tue Jun 4 15:58:36 2013 New Revision: 1489489
URL: http://svn.apache.org/r1489489 Log: NO-JIRA: make logging and exception messages more useful. Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/TimeoutException.java qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Delivery.java qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/TimeoutException.java URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/TimeoutException.java?rev=1489489&r1=1489488&r2=1489489&view=diff ============================================================================== --- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/TimeoutException.java (original) +++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/TimeoutException.java Tue Jun 4 15:58:36 2013 @@ -40,4 +40,9 @@ public class TimeoutException extends Pr { super(cause); } + + public TimeoutException(long timeoutMillis, String pendingCondition) + { + this("Timed out after " + timeoutMillis + " ms waiting for condition: " + pendingCondition); + } } Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Delivery.java URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Delivery.java?rev=1489489&r1=1489488&r2=1489489&view=diff ============================================================================== --- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Delivery.java (original) +++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Delivery.java Tue Jun 4 15:58:36 2013 @@ -60,7 +60,7 @@ public interface Delivery /** * Returns whether this delivery has been settled. * - * TODO proton-j and proton-c return the local and remote statuses. Resolve this ambiguity. + * TODO proton-j and proton-c return the local and remote statuses respectively. Resolve this ambiguity. * * @see #settle() */ Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java?rev=1489489&r1=1489488&r2=1489489&view=diff ============================================================================== --- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java (original) +++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java Tue Jun 4 15:58:36 2013 @@ -20,6 +20,8 @@ */ package org.apache.qpid.proton.engine.impl; +import java.util.Arrays; + import org.apache.qpid.proton.engine.Delivery; import org.apache.qpid.proton.engine.Transport; import org.apache.qpid.proton.amqp.transport.DeliveryState; @@ -463,4 +465,25 @@ public class DeliveryImpl implements Del _context = context; } + @Override + public String toString() + { + StringBuilder builder = new StringBuilder(); + builder.append("DeliveryImpl [_tag=").append(Arrays.toString(_tag)) + .append(", _link=").append(_link) + .append(", _deliveryState=").append(_deliveryState) + .append(", _settled=").append(_settled) + .append(", _remoteSettled=").append(_remoteSettled) + .append(", _remoteDeliveryState=").append(_remoteDeliveryState) + .append(", _flags=").append(_flags) + .append(", _transportFlags=").append(_transportFlags) + .append(", _transportDelivery=").append(_transportDelivery) + .append(", _dataSize=").append(_dataSize) + .append(", _complete=").append(_complete) + .append(", _updated=").append(_updated) + .append(", _done=").append(_done) + .append(", _offset=").append(_offset).append("]"); + return builder.toString(); + } + } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
