geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r536244 - in /geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat: interceptor/BeforeAfter.java interceptor/UserTransactionBeforeAfter.java valve/GeronimoBeforeAfterValve.java
Date Tue, 08 May 2007 16:35:19 GMT
Author: jgenender
Date: Tue May  8 09:35:18 2007
New Revision: 536244

URL: http://svn.apache.org/viewvc?view=rev&rev=536244
Log:
Fix logic

Modified:
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/BeforeAfter.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/UserTransactionBeforeAfter.java
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/BeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/BeforeAfter.java?view=diff&rev=536244&r1=536243&r2=536244
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/BeforeAfter.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/BeforeAfter.java
Tue May  8 09:35:18 2007
@@ -21,7 +21,7 @@
 
 public interface BeforeAfter {
 
-    public static final int DEFAULT = 0;
+    public static final int EDGE_SERVLET = 0;
 
     public static final int DISPATCHED = 1;
 

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/UserTransactionBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/UserTransactionBeforeAfter.java?view=diff&rev=536244&r1=536243&r2=536244
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/UserTransactionBeforeAfter.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/UserTransactionBeforeAfter.java
Tue May  8 09:35:18 2007
@@ -48,7 +48,7 @@
         }
         
         boolean active = (Boolean)context[index];
-        if ((!active && isMarkedRollback()) || (dispatch != DISPATCHED &&
isActive())) {
+        if ((!active && isMarkedRollback()) || (dispatch == EDGE_SERVLET &&
isActive())) {
             try {
                 userTransaction.rollback();
             } catch (SystemException e) {

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java?view=diff&rev=536244&r1=536243&r2=536244
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java
Tue May  8 09:35:18 2007
@@ -40,7 +40,7 @@
         Object context[] = new Object[contextIndexCount];
         
         if (beforeAfter != null){
-            beforeAfter.before(context, request, response, BeforeAfter.DEFAULT);
+            beforeAfter.before(context, request, response, BeforeAfter.EDGE_SERVLET);
         }
         
         // Pass this request on to the next valve in our pipeline



Mime
View raw message