Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java Mon May 21 08:11:23 2007 @@ -32,8 +32,8 @@ */ public class AMQDisconnectedException extends AMQException { - public AMQDisconnectedException(String msg) + public AMQDisconnectedException(String msg, Throwable cause) { - super(msg); + super(null, msg, cause); } }
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java Mon May 21 08:11:23 2007 @@ -44,48 +44,11 @@ * * @param errorCode The error code. May be null if not to be set. * @param msg The exception message. May be null if not to be set. - * @param t The underlying cause of the exception. May be null if not to be set. + * @param cause The underlying cause of the exception. May be null if not to be set. */ - public AMQException(AMQConstant errorCode, String msg, Throwable t) + public AMQException(AMQConstant errorCode, String msg, Throwable cause) { - super(((msg == null) ? "" : msg) + ((errorCode == null) ? "" : (" [error code " + errorCode + "]")), t); - _errorCode = errorCode; - } - - /** - * @param message - * - * @deprecated Use [EMAIL PROTECTED] #AMQException(org.apache.qpid.protocol.AMQConstant, String, Throwable)} instead. - */ - public AMQException(String message) - { - super(message); - // fixme This method needs removed and all AMQExceptions need a valid error code - _errorCode = AMQConstant.getConstant(-1); - } - - /** - * @param msg - * @param t - * - * @deprecated Use [EMAIL PROTECTED] #AMQException(org.apache.qpid.protocol.AMQConstant, String, Throwable)} instead. - */ - public AMQException(String msg, Throwable t) - { - super(msg, t); - // fixme This method needs removed and all AMQExceptions need a valid error code - _errorCode = AMQConstant.getConstant(-1); - } - - /** - * @param errorCode - * @param msg - * - * @deprecated Use [EMAIL PROTECTED] #AMQException(org.apache.qpid.protocol.AMQConstant, String, Throwable)} instead. - */ - public AMQException(AMQConstant errorCode, String msg) - { - super(msg + " [error code " + errorCode + ']'); + super(((msg == null) ? "" : msg) + ((errorCode == null) ? "" : (" [error code " + errorCode + "]")), cause); _errorCode = errorCode; } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java Mon May 21 08:11:23 2007 @@ -32,8 +32,8 @@ */ public class AMQInvalidArgumentException extends AMQException { - public AMQInvalidArgumentException(String message) + public AMQInvalidArgumentException(String message, Throwable cause) { - super(AMQConstant.INVALID_ARGUMENT, message); + super(AMQConstant.INVALID_ARGUMENT, message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java Mon May 21 08:11:23 2007 @@ -32,8 +32,8 @@ */ public class AMQInvalidRoutingKeyException extends AMQException { - public AMQInvalidRoutingKeyException(String message) + public AMQInvalidRoutingKeyException(String message, Throwable cause) { - super(AMQConstant.INVALID_ROUTING_KEY, message); + super(AMQConstant.INVALID_ROUTING_KEY, message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java Mon May 21 08:11:23 2007 @@ -32,8 +32,8 @@ */ public class AMQTimeoutException extends AMQException { - public AMQTimeoutException(String message) + public AMQTimeoutException(String message, Throwable cause) { - super(AMQConstant.REQUEST_TIMEOUT, message); + super(AMQConstant.REQUEST_TIMEOUT, message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java Mon May 21 08:11:23 2007 @@ -34,9 +34,9 @@ { private Object _bounced; - public AMQUndeliveredException(AMQConstant errorCode, String msg, Object bounced) + public AMQUndeliveredException(AMQConstant errorCode, String msg, Object bounced, Throwable cause) { - super(errorCode, msg); + super(errorCode, msg, cause); _bounced = bounced; } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java Mon May 21 08:11:23 2007 @@ -15,8 +15,8 @@ */ public class AMQUnknownExchangeType extends AMQException { - public AMQUnknownExchangeType(String message) + public AMQUnknownExchangeType(String message, Throwable cause) { - super(message); + super(null, message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java Mon May 21 08:11:23 2007 @@ -37,9 +37,9 @@ { String _broker; - public AMQUnresolvedAddressException(String message, String broker) + public AMQUnresolvedAddressException(String message, String broker, Throwable cause) { - super(message); + super(null, message, cause); _broker = broker; } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java Mon May 21 08:11:23 2007 @@ -36,25 +36,8 @@ */ public class PropertyException extends AMQException { - public PropertyException(String message) + public PropertyException(String message, Throwable cause) { - super(message); + super(null, message, cause); } - - /* - public PropertyException(String msg, Throwable t) - { - super(msg, t); - } - - public PropertyException(AMQConstant errorCode, String msg, Throwable t) - { - super(errorCode, msg, t); - } - - public PropertyException(AMQConstant errorCode, String msg) - { - super(errorCode, msg); - } - */ } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java Mon May 21 08:11:23 2007 @@ -80,7 +80,7 @@ if (replacement == null) { - throw new PropertyException("Property ${" + propertyName + "} has not been set"); + throw new PropertyException("Property ${" + propertyName + "} has not been set", null); } fragment = replacement; @@ -145,7 +145,7 @@ int endName = value.indexOf('}', pos); if (endName < 0) { - throw new PropertyException("Syntax error in property: " + value); + throw new PropertyException("Syntax error in property: " + value, null); } String propertyName = value.substring(pos + 2, endName); Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java Mon May 21 08:11:23 2007 @@ -34,8 +34,8 @@ */ public class AMQFrameDecodingException extends AMQException { - public AMQFrameDecodingException(AMQConstant errorCode, String message, Throwable t) + public AMQFrameDecodingException(AMQConstant errorCode, String message, Throwable cause) { - super(errorCode, message, t); + super(errorCode, message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java Mon May 21 08:11:23 2007 @@ -111,7 +111,7 @@ public AMQChannelException getChannelException(AMQConstant code, String message) { - return new AMQChannelException(code, message, getClazz(), getMethod(), major, minor); + return new AMQChannelException(code, message, getClazz(), getMethod(), major, minor, null); } public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause) @@ -121,7 +121,7 @@ public AMQConnectionException getConnectionException(AMQConstant code, String message) { - return new AMQConnectionException(code, message, getClazz(), getMethod(), major, minor); + return new AMQConnectionException(code, message, getClazz(), getMethod(), major, minor, null); } public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause) Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java Mon May 21 08:11:23 2007 @@ -32,8 +32,8 @@ */ public class AMQProtocolClassException extends AMQProtocolHeaderException { - public AMQProtocolClassException(String message) + public AMQProtocolClassException(String message, Throwable cause) { - super(message); + super(message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java Mon May 21 08:11:23 2007 @@ -34,8 +34,8 @@ */ public class AMQProtocolHeaderException extends AMQException { - public AMQProtocolHeaderException(String message) + public AMQProtocolHeaderException(String message, Throwable cause) { - super(message); + super(null, message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java Mon May 21 08:11:23 2007 @@ -32,8 +32,8 @@ */ public class AMQProtocolInstanceException extends AMQProtocolHeaderException { - public AMQProtocolInstanceException(String message) + public AMQProtocolInstanceException(String message, Throwable cause) { - super(message); + super(message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java Mon May 21 08:11:23 2007 @@ -32,8 +32,8 @@ */ public class AMQProtocolVersionException extends AMQProtocolHeaderException { - public AMQProtocolVersionException(String message) + public AMQProtocolVersionException(String message, Throwable cause) { - super(message); + super(message, cause); } } Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java Mon May 21 08:11:23 2007 @@ -144,7 +144,7 @@ if(_protocolHeader.length != 4) { - throw new AMQProtocolHeaderException("Protocol header should have exactly four octets"); + throw new AMQProtocolHeaderException("Protocol header should have exactly four octets", null); } for(int i = 0; i < 4; i++) { @@ -152,7 +152,7 @@ { try { - throw new AMQProtocolHeaderException("Protocol header is not correct: Got " + new String(_protocolHeader,"ISO-8859-1") + " should be: " + new String(AMQP_HEADER, "ISO-8859-1")); + throw new AMQProtocolHeaderException("Protocol header is not correct: Got " + new String(_protocolHeader,"ISO-8859-1") + " should be: " + new String(AMQP_HEADER, "ISO-8859-1"), null); } catch (UnsupportedEncodingException e) { @@ -163,12 +163,12 @@ if (_protocolClass != CURRENT_PROTOCOL_CLASS) { throw new AMQProtocolClassException("Protocol class " + CURRENT_PROTOCOL_CLASS + " was expected; received " + - _protocolClass); + _protocolClass, null); } if (_protocolInstance != TCP_PROTOCOL_INSTANCE) { throw new AMQProtocolInstanceException("Protocol instance " + TCP_PROTOCOL_INSTANCE + " was expected; received " + - _protocolInstance); + _protocolInstance, null); } ProtocolVersion pv = new ProtocolVersion(_protocolMajor, _protocolMinor); @@ -178,7 +178,7 @@ { // TODO: add list of available versions in list to msg... throw new AMQProtocolVersionException("Protocol version " + - _protocolMajor + "." + _protocolMinor + " not suppoerted by this version of the Qpid broker."); + _protocolMajor + "." + _protocolMinor + " not suppoerted by this version of the Qpid broker.", null); } } Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java?view=diff&rev=540165&r1=540164&r2=540165 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java Mon May 21 08:11:23 2007 @@ -268,7 +268,7 @@ { public void prepare() throws AMQException { - throw new AMQException("Fail!"); + throw new AMQException(null, "Fail!", null); } }
