svn commit: r648735 - in /incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server: exchange/DefaultExchangeFactory.java handler/ExchangeDeclareHandler.java

[aidan]

Author: aidan
Date: Wed Apr 16 09:21:23 2008
New Revision: 648735

URL: http://svn.apache.org/viewvc?rev=648735&view=rev
Log:
QPID-832 fix exception constructors

Modified:
    
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
    
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java

Modified: 
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java?rev=648735&r1=648734&r2=648735&view=diff
==============================================================================
--- 
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
 (original)
+++ 
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
 Wed Apr 16 09:21:23 2008
@@ -67,7 +67,7 @@
         if (exchType == null)
         {
 
-            throw new AMQUnknownExchangeType("Unknown exchange type: " + type);
+            throw new AMQUnknownExchangeType("Unknown exchange type: " + type, 
null);
         }
         Exchange e = exchType.newInstance(_host, exchange, durable, ticket, 
autoDelete);
         return e;

Modified: 
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java?rev=648735&r1=648734&r2=648735&view=diff
==============================================================================
--- 
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
 (original)
+++ 
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
 Wed Apr 16 09:21:23 2008
@@ -101,7 +101,8 @@
             else if (!exchange.getType().equals(body.getType()))
             {
 
-                throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, 
"Attempt to redeclare exchange: " + body.getExchange() + " of type " + 
exchange.getType() + " to " + body.getType() +".",body.getClazz(), 
body.getMethod(),body.getMajor(),body.getMinor());
+                throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, 
"Attempt to redeclare exchange: " + body.getExchange() + " of type " + 
exchange.getType() + " to " + body.getType() +".",body.getClazz(), 
body.getMethod(),body.getMajor(),body.getMinor(),
+                        null);
             }
 
         }