geronimo-scm mailing list archives

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



Mime
View raw message