Revision: 494658

Author: rgreig
Date: 00:11:27, 10 January 2007
Message:
QPID-271 : (Patch supplied by Rob Godfrey) Implement fanout exchange
----
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
Added : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java

Revision: 494655
Author: rgreig
Date: 23:46:48, 09 January 2007
Message:
QPID-270 : (Patch supplied by Rob Godfrey) Change of use of AMQConnectionException
----
Modified : /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
Modified : /incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
Modified : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java


Revision: 494652
Author: rgreig
Date: 23:36:50, 09 January 2007
Message:
QPID-269 : (Patch supplied by Rob Godfrey) Add getType() to Exchange
----
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java


494650 - PARTIAL
Revision: 494650
Author: rgreig
Date: 23:22:52, 09 January 2007
Message:
QPID-268 : (Patch supplied by Rob Godfrey) Improvements to performance of generated code
----

Added : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
Added : /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting@499828 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 5 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index 034cf3a1eb..7903ef4d10 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -21,7 +21,7 @@
 package org.apache.qpid.client;
 
 import org.apache.log4j.Logger;
-import org.apache.qpid.AMQConnectionException;
+import org.apache.qpid.AMQConnectionFailureException;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQUndeliveredException;
 import org.apache.qpid.AMQUnresolvedAddressException;
@@ -274,8 +274,8 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
                 message = "Unable to Connect";
             }
 
-            AMQException e = new AMQConnectionException(message);
-
+            AMQException e = new AMQConnectionFailureException(message);
+            
             if (lastException != null)
             {
                 if (lastException instanceof UnresolvedAddressException)
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index c5aa62032c..b3dd4aca64 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -24,8 +24,8 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQAuthenticationException;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQConnectionException;
 import org.apache.qpid.AMQUnresolvedAddressException;
+import org.apache.qpid.AMQConnectionFailureException;
 
 import javax.jms.Connection;
 
@@ -88,7 +88,7 @@ public class ConnectionTest extends TestCase
         }
         catch (AMQException amqe)
         {
-            if (!(amqe instanceof AMQConnectionException))
+            if (!(amqe instanceof AMQConnectionFailureException))
             {
                 fail("Correct exception not thrown. Excpected 'AMQConnectionException' got: " + amqe);
             }