Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 54879 invoked from network); 12 Jul 2006 18:59:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jul 2006 18:59:34 -0000 Received: (qmail 71952 invoked by uid 500); 12 Jul 2006 18:59:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 71943 invoked by uid 500); 12 Jul 2006 18:59:33 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 71932 invoked by uid 99); 12 Jul 2006 18:59:33 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2006 11:59:33 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2006 11:59:32 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6F5571A981A; Wed, 12 Jul 2006 11:59:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r421369 - in /geronimo/sandbox/svkmerge/m2migration/modules/connector/src/java/org/apache/geronimo/connector/outbound: ./ ManagedConnectionFactoryWrapper.java Date: Wed, 12 Jul 2006 18:59:11 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060712185912.6F5571A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jdillon Date: Wed Jul 12 11:59:11 2006 New Revision: 421369 URL: http://svn.apache.org/viewvc?rev=421369&view=rev Log: Merge #421362 for GERONIMO-1596 Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector/src/java/org/apache/geronimo/connector/outbound/ (props changed) geronimo/sandbox/svkmerge/m2migration/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Propchange: geronimo/sandbox/svkmerge/m2migration/modules/connector/src/java/org/apache/geronimo/connector/outbound/ ------------------------------------------------------------------------------ --- svk:merge (added) +++ svk:merge Wed Jul 12 11:59:11 2006 @@ -0,0 +1 @@ +13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound:421368 Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java?rev=421369&r1=421368&r2=421369&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java (original) +++ geronimo/sandbox/svkmerge/m2migration/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Wed Jul 12 11:59:11 2006 @@ -20,6 +20,7 @@ import java.lang.reflect.Constructor; import java.util.HashMap; import java.util.Map; +import java.util.LinkedHashSet; import javax.management.ObjectName; import javax.resource.ResourceException; @@ -114,12 +115,13 @@ this.connectionInterface = connectionInterface; this.connectionImplClass = connectionImplClass; - allImplementedInterfaces = new Class[1 + implementedInterfaces.length]; - allImplementedInterfaces[0] = cl.loadClass(connectionFactoryInterface); + LinkedHashSet allInterfaceSet = new LinkedHashSet(); + allInterfaceSet.add(cl.loadClass(connectionFactoryInterface)); for (int i = 0; i < implementedInterfaces.length; i++) { - allImplementedInterfaces[i + 1] = cl.loadClass(implementedInterfaces[i]); - + allInterfaceSet.add(cl.loadClass(implementedInterfaces[i])); } + allImplementedInterfaces = (Class[])allInterfaceSet.toArray(new Class[allInterfaceSet.size()]); + boolean mightBeProxyable = true; for (int i = 0; i < allImplementedInterfaces.length; i++) { Class implementedInterface = allImplementedInterfaces[i];