keycloak-uncached

Merge pull request #2113 from stianst/KEYCLOAK-2327 KEYCLOAK-2327

1/26/2016 1:06:15 PM

Details

diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java
index 84684bd..fb8e14b 100755
--- a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java
+++ b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java
@@ -59,25 +59,10 @@ public class KeycloakSessionServletFilter implements Filter {
 
         try {
             filterChain.doFilter(servletRequest, servletResponse);
-            if (tx.isActive()) {
-                if (tx.getRollbackOnly()) tx.rollback();
-                else tx.commit();
-            }
-        } catch (IOException ex) {
-            if (tx.isActive()) tx.rollback();
-            throw ex;
-        } catch (ServletException ex) {
-            if (tx.isActive()) tx.rollback();
-            throw ex;
-        }
-        catch (RuntimeException ex) {
-            if (tx.isActive()) tx.rollback();
-            throw new RuntimeException("request path: " + request.getRequestURI(), ex);
         } finally {
             session.close();
             ResteasyProviderFactory.clearContextData();
         }
-
     }
 
     @Override
diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakTransactionCommitter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakTransactionCommitter.java
index ab3bc1b..9fedcd5 100644
--- a/services/src/main/java/org/keycloak/services/filters/KeycloakTransactionCommitter.java
+++ b/services/src/main/java/org/keycloak/services/filters/KeycloakTransactionCommitter.java
@@ -20,8 +20,11 @@ public class KeycloakTransactionCommitter implements ContainerResponseFilter {
     public void filter(ContainerRequestContext containerRequestContext, ContainerResponseContext containerResponseContext) throws IOException {
         KeycloakTransaction tx = ResteasyProviderFactory.getContextData(KeycloakTransaction.class);
         if (tx != null && tx.isActive()) {
-            if (tx.getRollbackOnly()) tx.rollback();
-            else tx.commit();
+            if (tx.getRollbackOnly()) {
+                tx.rollback();
+            } else {
+                tx.commit();
+            }
         }
     }
 
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java
index 308fb67..9f9d459 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java
@@ -34,7 +34,6 @@ import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
 import org.keycloak.models.RealmModel;
 import org.keycloak.representations.idm.RealmRepresentation;
-import org.keycloak.services.filters.ClientConnectionFilter;
 import org.keycloak.services.filters.KeycloakSessionServletFilter;
 import org.keycloak.services.managers.ApplianceBootstrap;
 import org.keycloak.services.managers.RealmManager;
@@ -318,10 +317,6 @@ public class KeycloakServer {
             di.addFilter(filter);
             di.addFilterUrlMapping("SessionFilter", "/*", DispatcherType.REQUEST);
 
-            FilterInfo connectionFilter = Servlets.filter("ClientConnectionFilter", ClientConnectionFilter.class);
-            di.addFilter(connectionFilter);
-            di.addFilterUrlMapping("ClientConnectionFilter", "/*", DispatcherType.REQUEST);
-
             server.deploy(di);
 
             sessionFactory = ((KeycloakApplication) deployment.getApplication()).getSessionFactory();