geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
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 GMT
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];



Mime
View raw message