You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2010/08/07 06:48:10 UTC
svn commit: r983174 - in /geronimo/server/trunk: plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java pom.xml

Author: kevan
Date: Sat Aug  7 04:48:10 2010
New Revision: 983174

URL: http://svn.apache.org/viewvc?rev=983174&view=rev
Log:
GERONIMO-5189 merge from branches/2.2

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java?rev=983174&r1=983173&r2=983174&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java Sat Aug  7 04:48:10 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);
             }
@@ -65,7 +66,7 @@ public class InstanceContextBeforeAfter 
             next.after(context, httpRequest, httpResponse, dispatch);
         }
         try {
-            SharedConnectorInstanceContext oldConnectorInstanceContext = (SharedConnectorInstanceContext) context[oldIndex];
+            ConnectorInstanceContext oldConnectorInstanceContext = (ConnectorInstanceContext) context[oldIndex];
             SharedConnectorInstanceContext newConnectorInstanceContext = (SharedConnectorInstanceContext) context[newIndex];
             if (oldConnectorInstanceContext != null) {
                 newConnectorInstanceContext.hide();

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=983174&r1=983173&r2=983174&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Aug  7 04:48:10 2010
@@ -79,7 +79,7 @@
         <springVersion>2.5.6-SEC02</springVersion>
         <xbeanVersion>3.8-SNAPSHOT</xbeanVersion>
         <jetty>jetty8</jetty>
-        <txmanagerVersion>3.0</txmanagerVersion>
+        <txmanagerVersion>3.1-SNAPSHOT</txmanagerVersion>
         <tranqlVersion>1.6</tranqlVersion>
         <tranqlDerbyVersion>1.6</tranqlDerbyVersion>