Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 36087 invoked from network); 27 Dec 2010 05:52:06 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Dec 2010 05:52:06 -0000 Received: (qmail 51468 invoked by uid 500); 27 Dec 2010 05:52:06 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 51412 invoked by uid 500); 27 Dec 2010 05:52:03 -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 51405 invoked by uid 99); 27 Dec 2010 05:52:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Dec 2010 05:52:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Dec 2010 05:52:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 93634238897A; Mon, 27 Dec 2010 05:51:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1053001 - in /geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound: GenericConnectionManagerGBean.java JCAConnectionFactoryImpl.java Date: Mon, 27 Dec 2010 05:51:41 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101227055141.93634238897A@eris.apache.org> Author: xuhaihong Date: Mon Dec 27 05:51:41 2010 New Revision: 1053001 URL: http://svn.apache.org/viewvc?rev=1053001&view=rev Log: GERONIMO-5741 java.lang.ClassCastException at JCAConnectionFactoryImpl.getManagedConnectionFactoryInstance() line: 64 (Patch from Shenhao Fang) Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java?rev=1053001&r1=1053000&r2=1053001&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java (original) +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java Mon Dec 27 05:51:41 2010 @@ -46,6 +46,7 @@ import org.apache.geronimo.kernel.GBeanN import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.KernelRegistry; import org.apache.geronimo.kernel.proxy.ProxyManager; +import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory; import org.apache.geronimo.naming.ResourceSource; import org.apache.geronimo.security.ContextManager; import org.apache.geronimo.transaction.manager.RecoverableTransactionManager; @@ -62,6 +63,8 @@ public class GenericConnectionManagerGBe //externalizable format version private static final int VERSION = 1; + private ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper; + public GenericConnectionManagerGBean(@ParamAttribute(name="transactionSupport") TransactionSupport transactionSupport, @ParamAttribute(name="pooling")PoolingSupport pooling, @ParamAttribute(name="containerManagedSecurity")boolean containerManagedSecurity, @@ -76,7 +79,7 @@ public class GenericConnectionManagerGBe super(transactionSupport, pooling, getSubjectSource(containerManagedSecurity), connectionTracker, transactionManager, managedConnectionFactoryWrapper.getManagedConnectionFactory(), objectName, classLoader); this.kernel = kernel; this.abstractName = abstractName; - + this.managedConnectionFactoryWrapper = managedConnectionFactoryWrapper; doRecovery(); } @@ -85,6 +88,10 @@ public class GenericConnectionManagerGBe super(); } + public JCAManagedConnectionFactory getJCAManagedConnectionFactory() { + return managedConnectionFactoryWrapper; + } + public ConnectionManager getConnectionManager() { ConnectionManager unproxied = super.getConnectionManager(); ProxyManager pm = kernel.getProxyManager(); Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java?rev=1053001&r1=1053000&r2=1053001&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java (original) +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java Mon Dec 27 05:51:41 2010 @@ -56,12 +56,12 @@ public class JCAConnectionFactoryImpl im @Override public String getManagedConnectionFactory() { - return ((JCAManagedConnectionFactory)connectionManager.getManagedConnectionFactory()).getObjectName(); + return getManagedConnectionFactoryInstance().getObjectName(); } @Override public JCAManagedConnectionFactory getManagedConnectionFactoryInstance() { - return ((JCAManagedConnectionFactory)connectionManager.getManagedConnectionFactory()); + return connectionManager.getJCAManagedConnectionFactory(); } @Override