From activemq-commits-return-327-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org Thu Jan 05 10:55:27 2006 Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 84438 invoked from network); 5 Jan 2006 10:55:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Jan 2006 10:55:27 -0000 Received: (qmail 78923 invoked by uid 500); 5 Jan 2006 10:55:27 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 78892 invoked by uid 500); 5 Jan 2006 10:55:27 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 78883 invoked by uid 99); 5 Jan 2006 10:55:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jan 2006 02:55:27 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 05 Jan 2006 02:55:26 -0800 Received: (qmail 84347 invoked by uid 65534); 5 Jan 2006 10:55:16 -0000 Message-ID: <20060105105516.84346.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r366156 - /incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java Date: Thu, 05 Jan 2006 10:55:15 -0000 To: activemq-commits@geronimo.apache.org From: jstrachan@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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()); + } } /**