From scm-return-43743-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Thu Aug 05 00:30:46 2010 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 76397 invoked from network); 5 Aug 2010 00:30:46 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Aug 2010 00:30:46 -0000 Received: (qmail 73262 invoked by uid 500); 5 Aug 2010 00:30:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 73221 invoked by uid 500); 5 Aug 2010 00:30:45 -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 73214 invoked by uid 99); 5 Aug 2010 00:30:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Aug 2010 00:30:45 +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; Thu, 05 Aug 2010 00:30:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C3E6F23889B1; Thu, 5 Aug 2010 00:29:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r982444 - /geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java Date: Thu, 05 Aug 2010 00:29:28 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100805002928.C3E6F23889B1@eris.apache.org> Author: kevan Date: Thu Aug 5 00:29:28 2010 New Revision: 982444 URL: http://svn.apache.org/viewvc?rev=982444&view=rev Log: GERONIMO-5189 fix classcastexception Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java?rev=982444&r1=982443&r2=982444&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java (original) +++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java Thu Aug 5 00:29:28 2010 @@ -22,6 +22,7 @@ import javax.resource.ResourceException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext; import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator; import org.apache.geronimo.connector.outbound.connectiontracking.SharedConnectorInstanceContext; @@ -46,7 +47,7 @@ public class InstanceContextBeforeAfter public void before(Object[] context, ServletRequest httpRequest, ServletResponse httpResponse, int dispatch) { try { SharedConnectorInstanceContext newConnectorInstanceContext = new SharedConnectorInstanceContext(unshareableResources, applicationManagedSecurityResources, false); - SharedConnectorInstanceContext oldContext = (SharedConnectorInstanceContext) trackedConnectionAssociator.enter(newConnectorInstanceContext); + ConnectorInstanceContext oldContext = trackedConnectionAssociator.enter(newConnectorInstanceContext); if (oldContext != null) { newConnectorInstanceContext.share(oldContext); }