Author: jstrachan
Date: Thu Jan 5 02:55:13 2006
New Revision: 366156
URL: http://svn.apache.org/viewcvs?rev=366156&view=rev
Log:
applied patch from AMQ-356
Modified:
incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
Modified:
incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java?rev=366156&r1=366155&r2=366156&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
(original)
+++
incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
Thu Jan 5 02:55:13 2006
@@ -261,7 +261,13 @@
* @see
javax.resource.spi.ManagedConnection#associateConnection(java.lang.Object)
*/
public void associateConnection(Object connection) throws
ResourceException {
- throw new ResourceException("Not supported.");
+ if (connection instanceof ManagedConnectionProxy) {
+ ManagedConnectionProxy proxy = (ManagedConnectionProxy) connection;
+ proxyConnections.add(proxy);
+ }
+ else {
+ throw new ResourceException("Not supported : associating
connection instance of " + connection.getClass().getName());
+ }
}
/**