From 259d388b86a1040a4d837e51e408c861a52d611c Mon Sep 17 00:00:00 2001
From: "alerant.appngin" <alerant.appngin@gmail.com>
Date: Fri, 11 Sep 2015 16:00:19 +0200
Subject: [PATCH] Fixing Bug caused by "IllegalStateException: UT000048: No
 request is currently active" error while webapp serving static contents

Fixing issue described in:
https://github.com/Mobicents/sip-servlets/pull/67#issuecomment-139281953
---
 .../jboss-as-mobicents/pom.xml                |  22 +---
 containers/sip-servlets-as8/pom.xml           |  24 ++--
 .../ConvergedInMemorySessionManager.java      |  67 +++++++----
 .../core/ConvergedDeploymentManagerImpl.java  |   1 +
 .../core/ConvergedSessionListenerBridge.java  |   4 +-
 .../servlet/core/SecurityActions.java         |  36 +++++-
 ...ervletRequestContextThreadSetupAction.java |  54 +++++++++
 .../ConvergedServletInitialHandler.java       | 113 +++++++++---------
 .../ConvergedServletRequestContext.java       |   4 +-
 .../ConvergedSessionRestoringHandler.java     |   3 +
 .../ConvergedHttpServletRequestFacade.java    |  18 ++-
 .../ConvergedHttpServletResponseFacade.java   |  11 +-
 .../spec/ConvergedHttpSessionFacade.java      |   5 +
 13 files changed, 239 insertions(+), 123 deletions(-)
 create mode 100644 containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ServletRequestContextThreadSetupAction.java

diff --git a/containers/sip-servlets-as8-drop-in/jboss-as-mobicents/pom.xml b/containers/sip-servlets-as8-drop-in/jboss-as-mobicents/pom.xml
index bd12a788a4..15d8c9e069 100644
--- a/containers/sip-servlets-as8-drop-in/jboss-as-mobicents/pom.xml
+++ b/containers/sip-servlets-as8-drop-in/jboss-as-mobicents/pom.xml
@@ -106,46 +106,36 @@
 	<dependency>
 		<groupId>org.wildfly</groupId>
 		<artifactId>wildfly-undertow</artifactId>
-		<version>8.2.0.Final</version>
+		<version>8.2.1.Final</version>
 		<scope>provided</scope>
-		<!-- exclusions>
-		    <exclusion>
-			<groupId>io.undertow</groupId>
-			<artifactId>undertow-core</artifactId>
-		    </exclusion>
-		    <exclusion>
-			<groupId>io.undertow</groupId>
-			<artifactId>undertow-servlet</artifactId>
-		    </exclusion>
-		</exclusions -->
 	</dependency>
 	<dependency>
 	        <groupId>org.wildfly</groupId>
     		<artifactId>wildfly-naming</artifactId>
-    		<version>8.2.0.Final</version>
+    		<version>8.2.1.Final</version>
  		<scope>provided</scope>
 	</dependency>				
 	<dependency>
 		<groupId>org.wildfly</groupId>
 		<artifactId>wildfly-web</artifactId>
-		<version>8.2.0.Final</version>
+		<version>8.2.1.Final</version>
 		<scope>provided</scope>
 	</dependency>		
 	<dependency>
 		<groupId>org.wildfly</groupId>
 		<artifactId>wildfly-web-common</artifactId>
-		<version>8.2.0.Final</version>
+		<version>8.2.1.Final</version>
 		<scope>provided</scope>
 	</dependency>		
 	<dependency>
 		<groupId>io.undertow</groupId>
 		<artifactId>undertow-core</artifactId>
-		<version>1.1.0.FINAL</version>
+		<version>1.1.8.Final</version>
 	</dependency>
 	<dependency>
 		<groupId>io.undertow</groupId>
 		<artifactId>undertow-servlet</artifactId>
-		<version>1.1.0.FINAL</version>
+		<version>1.1.8.Final</version>
 	</dependency>	
 
 	<dependency>
diff --git a/containers/sip-servlets-as8/pom.xml b/containers/sip-servlets-as8/pom.xml
index 8acedcdc73..836f31fd60 100644
--- a/containers/sip-servlets-as8/pom.xml
+++ b/containers/sip-servlets-as8/pom.xml
@@ -21,40 +21,30 @@
 		<dependency>
 			<groupId>org.wildfly</groupId>
   			<artifactId>wildfly-undertow</artifactId>
-  			<version>8.2.0.Final</version>
+  			<version>8.2.1.Final</version>
 			<scope>provided</scope>
-			<!-- exclusions>
-		            <exclusion>
-		                <groupId>io.undertow</groupId>
-		                <artifactId>undertow-core</artifactId>
-		            </exclusion>
-		            <exclusion>
-				<groupId>io.undertow</groupId>
-				<artifactId>undertow-servlet</artifactId>
-		            </exclusion>
-		        </exclusions -->
 		</dependency>
 		<dependency>
 			<groupId>org.wildfly</groupId>
   			<artifactId>wildfly-web</artifactId>
-  			<version>8.2.0.Final</version>
+  			<version>8.2.1.Final</version>
 			<scope>provided</scope>
 		</dependency>		
 		<dependency>
 			<groupId>org.wildfly</groupId>
   			<artifactId>wildfly-web-common</artifactId>
-  			<version>8.2.0.Final</version>
+  			<version>8.2.1.Final</version>
 			<scope>provided</scope>
 		</dependency>		
 		<dependency>
     			<groupId>io.undertow</groupId>
     			<artifactId>undertow-core</artifactId>
-  		        <version>1.1.0.FinaL</version>
+  		        <version>1.1.8.Final</version>
     		</dependency>
 		<dependency>
 			<groupId>io.undertow</groupId>
 			<artifactId>undertow-servlet</artifactId>
-			<version>1.1.0.FinaL</version>
+			<version>1.1.8.Final</version>
  		</dependency>
 		<!--dependency>
             		<groupId>org.jboss.security</groupId>
@@ -150,8 +140,8 @@
 					<compilerArguments>
 						<g />
 					</compilerArguments>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin> 
             <plugin>
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/server/session/ConvergedInMemorySessionManager.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/server/session/ConvergedInMemorySessionManager.java
index 0c275a7633..5f1898f9a4 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/server/session/ConvergedInMemorySessionManager.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/server/session/ConvergedInMemorySessionManager.java
@@ -103,7 +103,7 @@ public void stop() {
     }
 
     @Override
-    public Session createSession(HttpServerExchange serverExchange, SessionConfig sessionCookieConfig) {
+    public Session createSession(final HttpServerExchange serverExchange, final SessionConfig config) {
         if (evictionQueue != null) {
             while (sessions.size() >= maxSize && !evictionQueue.isEmpty()) {
                 String key = evictionQueue.poll();
@@ -114,10 +114,10 @@ public Session createSession(HttpServerExchange serverExchange, SessionConfig se
                 }
             }
         }
-        if (sessionCookieConfig == null) {
+        if (config == null) {
             throw UndertowMessages.MESSAGES.couldNotFindSessionCookieConfig();
         }
-        String sessionID = sessionCookieConfig.findSessionId(serverExchange);
+        String sessionID = config.findSessionId(serverExchange);
         int count = 0;
         while (sessionID == null) {
             sessionID = sessionIdGenerator.createSessionId();
@@ -136,10 +136,10 @@ public Session createSession(HttpServerExchange serverExchange, SessionConfig se
         } else {
             evictionToken = null;
         }
-        final ConvergedSessionImpl session = new ConvergedSessionImpl(this, sessionID, sessionCookieConfig, serverExchange.getIoThread(), serverExchange.getConnection().getWorker(), evictionToken);
+        final ConvergedSessionImpl session = new ConvergedSessionImpl(this, sessionID, config, serverExchange.getIoThread(), serverExchange.getConnection().getWorker(), evictionToken);
         ConvergedInMemorySession im = new ConvergedInMemorySession(session, defaultSessionTimeout);
         sessions.put(sessionID, im);
-        sessionCookieConfig.setSessionId(serverExchange, session.getId());
+        config.setSessionId(serverExchange, session.getId());
         im.lastAccessed = System.currentTimeMillis();
         session.bumpTimeout();
         sessionListeners.sessionCreated(session, serverExchange);
@@ -158,7 +158,7 @@ public void addConvergedSessionDeletegateToSession(SessionConfig sessionCookieCo
     }
 
     @Override
-    public Session getSession(HttpServerExchange serverExchange, SessionConfig sessionCookieConfig) {
+    public Session getSession(final HttpServerExchange serverExchange, final SessionConfig sessionCookieConfig) {
         String sessionId = sessionCookieConfig.findSessionId(serverExchange);
         return getSession(sessionId);
     }
@@ -182,12 +182,12 @@ public void registerSessionListener(SessionListener listener) {
     }
 
     @Override
-    public void removeSessionListener(SessionListener listener) {
+    public synchronized void removeSessionListener(final SessionListener listener) {
         sessionListeners.removeSessionListener(listener);
     }
 
     @Override
-    public void setDefaultSessionTimeout(int timeout) {
+    public void setDefaultSessionTimeout(final int timeout) {
         defaultSessionTimeout = timeout;
     }
 
@@ -206,6 +206,23 @@ public Set<String> getAllSessions() {
         return new HashSet<>(sessions.keySet());
     }
 
+    @Override
+    public boolean equals(Object object) {
+        if (!(object instanceof SessionManager)) return false;
+        SessionManager manager = (SessionManager) object;
+        return this.deploymentName.equals(manager.getDeploymentName());
+    }
+
+    @Override
+    public int hashCode() {
+        return this.deploymentName.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return this.deploymentName;
+    }
+
     /**
      * session implementation for the in memory session manager
      */
@@ -235,6 +252,7 @@ private static AtomicReferenceFieldUpdater<ConvergedSessionImpl, Object> createT
         private volatile Object evictionToken;
         private final SessionConfig sessionCookieConfig;
         private volatile long expireTime = -1;
+        private volatile boolean invalidationStarted = false;
 
         final XnioExecutor executor;
         final XnioWorker worker;
@@ -268,9 +286,13 @@ private ConvergedSessionImpl(ConvergedInMemorySessionManager sessionManager, fin
         }
 
         synchronized void bumpTimeout() {
+            if(invalidationStarted) {
+                return;
+            }
+
             final int maxInactiveInterval = getMaxInactiveInterval();
             if (maxInactiveInterval > 0) {
-                long newExpireTime = System.currentTimeMillis() + (maxInactiveInterval * 1000);
+                long newExpireTime = System.currentTimeMillis() + (maxInactiveInterval * 1000L);
                 if(timerCancelKey != null && (newExpireTime < expireTime)) {
                     // We have to re-schedule as the new maxInactiveInterval is lower than the old one
                     if (!timerCancelKey.remove()) {
@@ -283,7 +305,7 @@ synchronized void bumpTimeout() {
                     //+1 second, to make sure that the time has actually expired
                     //we don't re-schedule every time, as it is expensive
                     //instead when it expires we check if the timeout has been bumped, and if so we re-schedule
-                    timerCancelKey = executor.executeAfter(cancelTask, (maxInactiveInterval * 1000) + 1, TimeUnit.MILLISECONDS);
+                    timerCancelKey = executor.executeAfter(cancelTask, (maxInactiveInterval * 1000L) + 1, TimeUnit.MILLISECONDS);
                 }
             }
             if (evictionToken != null) {
@@ -405,22 +427,27 @@ public void invalidate(final HttpServerExchange exchange) {
             invalidate(exchange, SessionListener.SessionDestroyedReason.INVALIDATED);
         }
 
-        synchronized void invalidate(final HttpServerExchange exchange, SessionListener.SessionDestroyedReason reason) {
-            if (timerCancelKey != null) {
-                timerCancelKey.remove();
-            }
-            ConvergedInMemorySession sess = sessionManager.sessions.get(sessionId);
-            if (sess == null) {
-                if (reason == SessionListener.SessionDestroyedReason.INVALIDATED) {
-                    throw UndertowMessages.MESSAGES.sessionAlreadyInvalidated();
+        void invalidate(final HttpServerExchange exchange, SessionListener.SessionDestroyedReason reason) {
+            synchronized(ConvergedSessionImpl.this) {
+                if (timerCancelKey != null) {
+                    timerCancelKey.remove();
                 }
-                return;
+                ConvergedInMemorySession sess = sessionManager.sessions.get(sessionId);
+                if (sess == null) {
+                    if (reason == SessionListener.SessionDestroyedReason.INVALIDATED) {
+                        throw UndertowMessages.MESSAGES.sessionAlreadyInvalidated();
+                    }
+                    return;
+                }
+                invalidationStarted = true;
             }
-            sessionManager.sessionListeners.sessionDestroyed(sess.session, exchange, reason);
+            sessionManager.sessionListeners.sessionDestroyed(this, exchange, reason);
+
             sessionManager.sessions.remove(sessionId);
             if (exchange != null) {
                 sessionCookieConfig.clearSession(exchange, this.getId());
             }
+                
         }
 
         @Override
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ConvergedDeploymentManagerImpl.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ConvergedDeploymentManagerImpl.java
index cef1115c84..24651264a9 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ConvergedDeploymentManagerImpl.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ConvergedDeploymentManagerImpl.java
@@ -185,6 +185,7 @@ public void deploy() {
         }
 
         final List<ThreadSetupAction> setup = new ArrayList<>();
+        setup.add(ServletRequestContextThreadSetupAction.INSTANCE);
         setup.add(new ContextClassLoaderSetupAction(deploymentInfo.getClassLoader()));
         setup.addAll(deploymentInfo.getThreadSetupActions());
         final CompositeThreadSetupAction threadSetupAction = new CompositeThreadSetupAction(setup);
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ConvergedSessionListenerBridge.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ConvergedSessionListenerBridge.java
index b32d2aff41..e5eb8ea67d 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ConvergedSessionListenerBridge.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ConvergedSessionListenerBridge.java
@@ -46,8 +46,8 @@ public class ConvergedSessionListenerBridge extends SessionListenerBridge{
     private final ServletContext servletContext;
     private final SessionManager manager;
 
-    public ConvergedSessionListenerBridge(ThreadSetupAction threadSetup, ApplicationListeners applicationListeners,
-            ServletContext servletContext, SessionManager manager) {
+    public ConvergedSessionListenerBridge(final ThreadSetupAction threadSetup, final ApplicationListeners applicationListeners,
+            final ServletContext servletContext, final SessionManager manager) {
         super(threadSetup, applicationListeners, servletContext);
         this.threadSetup = threadSetup;
         this.applicationListeners = applicationListeners;
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/SecurityActions.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/SecurityActions.java
index 836cbb67bd..e6849436cb 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/SecurityActions.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/SecurityActions.java
@@ -43,6 +43,18 @@
  */
 class SecurityActions {
 
+    static String getSystemProperty(final String prop) {
+        if (System.getSecurityManager() == null) {
+           return System.getProperty(prop);
+        } else {
+            return (String) AccessController.doPrivileged(new PrivilegedAction<Object>() {
+                public Object run() {
+                    return System.getProperty(prop);
+                }
+            });
+        }
+    }
+    
     static HttpSession forSession(final Session session, final ServletContext servletContext, final boolean newSession, final SessionManager manager) {
         if (System.getSecurityManager() == null) {
             return ConvergedHttpSessionFacade.forConvergedSession(session, servletContext, newSession, manager);
@@ -69,18 +81,34 @@ public ServletRequestContext run() {
         }
     }
 
-    static String getSystemProperty(final String prop) {
+    static void setCurrentRequestContext(final ServletRequestContext servletRequestContext) {
         if (System.getSecurityManager() == null) {
-           return System.getProperty(prop);
+            ServletRequestContext.setCurrentRequestContext(servletRequestContext);
         } else {
-            return (String) AccessController.doPrivileged(new PrivilegedAction<Object>() {
+            AccessController.doPrivileged(new PrivilegedAction<Object>() {
+                @Override
                 public Object run() {
-                    return System.getProperty(prop);
+                    ServletRequestContext.setCurrentRequestContext(servletRequestContext);
+                    return null;
                 }
             });
         }
     }
 
+    static void clearCurrentServletAttachments() {
+        if (System.getSecurityManager() == null) {
+            ServletRequestContext.clearCurrentServletAttachments();
+        } else {
+            AccessController.doPrivileged(new PrivilegedAction<Object>() {
+                @Override
+                public Object run() {
+                    ServletRequestContext.clearCurrentServletAttachments();
+                    return null;
+                }
+            });
+        }
+    }
+    
     static ServletInitialHandler createServletInitialHandler(final ServletPathMatches paths, final HttpHandler next, final CompositeThreadSetupAction setupAction, final ServletContext servletContext) {
         if (System.getSecurityManager() == null) {
             return new ConvergedServletInitialHandler(paths, next, setupAction, /*TODO*/(ConvergedServletContextImpl) servletContext);
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ServletRequestContextThreadSetupAction.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ServletRequestContextThreadSetupAction.java
new file mode 100644
index 0000000000..35ceac77dc
--- /dev/null
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/core/ServletRequestContextThreadSetupAction.java
@@ -0,0 +1,54 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2011-2015, Telestax Inc and individual contributors
+ * by the @authors tag.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package org.mobicents.io.undertow.servlet.core;
+
+import io.undertow.server.HttpServerExchange;
+import io.undertow.servlet.api.ThreadSetupAction;
+import io.undertow.servlet.handlers.ServletRequestContext;
+
+/**
+ * This class is based on protected class io.undertow.servlet.core.ServletRequestContextThreadSetupAction.
+ *
+ * @author kakonyi.istvan@alerant.hu
+ */
+class ServletRequestContextThreadSetupAction implements ThreadSetupAction {
+
+    static final ServletRequestContextThreadSetupAction INSTANCE = new ServletRequestContextThreadSetupAction();
+
+    private ServletRequestContextThreadSetupAction() {
+
+    }
+
+    private static final Handle HANDLE = new Handle() {
+        @Override
+        public void tearDown() {
+            SecurityActions.clearCurrentServletAttachments();
+        }
+    };
+
+    @Override
+    public Handle setup(HttpServerExchange exchange) {
+        if(exchange == null) {
+            return null;
+        }
+        ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);
+        SecurityActions.setCurrentRequestContext(servletRequestContext);
+        return HANDLE;
+    }
+}
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedServletInitialHandler.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedServletInitialHandler.java
index f4135f041e..8a90d80083 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedServletInitialHandler.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedServletInitialHandler.java
@@ -66,6 +66,7 @@
 import io.undertow.util.HttpString;
 import io.undertow.util.Protocols;
 import io.undertow.util.RedirectBuilder;
+import io.undertow.util.StatusCodes;
 
 /**
  * This class extends io.undertow.servlet.handlers.ServletInitialHandler to create ConvergedServletRequestContext with
@@ -78,65 +79,13 @@ public class ConvergedServletInitialHandler extends ServletInitialHandler{
 
     private final ConvergedServletContextImpl convergedServletContext;
 
-    public ConvergedServletInitialHandler(ServletPathMatches paths, HttpHandler next, CompositeThreadSetupAction setupAction,
-            ConvergedServletContextImpl servletContext) {
+    public ConvergedServletInitialHandler(final ServletPathMatches paths,final HttpHandler next,final CompositeThreadSetupAction setupAction,
+            final ConvergedServletContextImpl servletContext) {
         super(paths, next, setupAction, servletContext.getDelegatedContext());
         this.convergedServletContext = servletContext;
 
     }
 
-    @Override
-    public void dispatchMockRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
-        ServletPathMatches paths=null;
-        try{
-            //lets get access of superclass private fields using reflection:
-            Field pathsField = ServletInitialHandler.class.getDeclaredField("paths");
-            pathsField.setAccessible(true);
-            paths = (ServletPathMatches)pathsField.get(this);
-            pathsField.setAccessible(false);
-        }catch(NoSuchFieldException | IllegalAccessException e){
-            throw new ServletException(e);
-        }
-
-        final ByteBufferSlicePool bufferPool = new ByteBufferSlicePool(BufferAllocator.BYTE_BUFFER_ALLOCATOR, 1024, 1024);
-        MockServerConnection connection = new MockServerConnection(bufferPool);
-        HttpServerExchange exchange = new HttpServerExchange(connection);
-        exchange.setRequestScheme(request.getScheme());
-        exchange.setRequestMethod(new HttpString(request.getMethod()));
-        exchange.setProtocol(Protocols.HTTP_1_0);
-        exchange.setResolvedPath(request.getContextPath());
-        String relative;
-        if (request.getPathInfo() == null) {
-            relative = request.getServletPath();
-        } else {
-            relative = request.getServletPath() + request.getPathInfo();
-        }
-        exchange.setRelativePath(relative);
-        final ServletPathMatch info = paths.getServletHandlerByPath(request.getServletPath());
-        final HttpServletResponseImpl oResponse = new HttpServletResponseImpl(exchange, convergedServletContext.getDelegatedContext());
-        final HttpServletRequestImpl oRequest = new HttpServletRequestImpl(exchange, convergedServletContext.getDelegatedContext());
-        final ServletRequestContext servletRequestContext = new ServletRequestContext(convergedServletContext.getDeployment(), oRequest, oResponse, info);
-        servletRequestContext.setServletRequest(request);
-        servletRequestContext.setServletResponse(response);
-        //set the max request size if applicable
-        if (info.getServletChain().getManagedServlet().getMaxRequestSize() > 0) {
-            exchange.setMaxEntitySize(info.getServletChain().getManagedServlet().getMaxRequestSize());
-        }
-        exchange.putAttachment(ServletRequestContext.ATTACHMENT_KEY, servletRequestContext);
-
-        exchange.startBlocking(new ServletBlockingHttpExchange(exchange));
-        servletRequestContext.setServletPathMatch(info);
-
-        try {
-            dispatchRequest(exchange, servletRequestContext, info.getServletChain(), DispatcherType.REQUEST);
-        } catch (Exception e) {
-            if (e instanceof RuntimeException) {
-                throw (RuntimeException) e;
-            }
-            throw new ServletException(e);
-        }
-    }
-
     @Override
     public void handleRequest(final HttpServerExchange exchange) throws Exception {
         ServletPathMatches paths=null;
@@ -152,7 +101,7 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception {
 
         final String path = exchange.getRelativePath();
         if(isForbiddenPath(path)) {
-            exchange.setResponseCode(404);
+            exchange.setResponseCode(StatusCodes.NOT_FOUND);
             return;
         }
         final ServletPathMatch info = paths.getServletHandlerByPath(path);
@@ -166,7 +115,7 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception {
         if (info.getType() == ServletPathMatch.Type.REDIRECT && !isUpgradeRequest) {
             //UNDERTOW-89
             //we redirect on GET requests to the root context to add an / to the end
-            exchange.setResponseCode(302);
+            exchange.setResponseCode(StatusCodes.TEMPORARY_REDIRECT);
             exchange.getResponseHeaders().put(Headers.LOCATION, RedirectBuilder.redirect(exchange, exchange.getRelativePath() + "/", true));
             return;
         } else if (info.getType() == ServletPathMatch.Type.REWRITE) {
@@ -220,6 +169,58 @@ public Object run() throws Exception{
         }
     }
 
+    @Override
+    public void dispatchMockRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        ServletPathMatches paths=null;
+        try{
+            //lets get access of superclass private fields using reflection:
+            Field pathsField = ServletInitialHandler.class.getDeclaredField("paths");
+            pathsField.setAccessible(true);
+            paths = (ServletPathMatches)pathsField.get(this);
+            pathsField.setAccessible(false);
+        }catch(NoSuchFieldException | IllegalAccessException e){
+            throw new ServletException(e);
+        }
+
+        final ByteBufferSlicePool bufferPool = new ByteBufferSlicePool(BufferAllocator.BYTE_BUFFER_ALLOCATOR, 1024, 1024);
+        MockServerConnection connection = new MockServerConnection(bufferPool);
+        HttpServerExchange exchange = new HttpServerExchange(connection);
+        exchange.setRequestScheme(request.getScheme());
+        exchange.setRequestMethod(new HttpString(request.getMethod()));
+        exchange.setProtocol(Protocols.HTTP_1_0);
+        exchange.setResolvedPath(request.getContextPath());
+        String relative;
+        if (request.getPathInfo() == null) {
+            relative = request.getServletPath();
+        } else {
+            relative = request.getServletPath() + request.getPathInfo();
+        }
+        exchange.setRelativePath(relative);
+        final ServletPathMatch info = paths.getServletHandlerByPath(request.getServletPath());
+        final HttpServletResponseImpl oResponse = new HttpServletResponseImpl(exchange, convergedServletContext.getDelegatedContext());
+        final HttpServletRequestImpl oRequest = new HttpServletRequestImpl(exchange, convergedServletContext.getDelegatedContext());
+        final ServletRequestContext servletRequestContext = new ServletRequestContext(convergedServletContext.getDeployment(), oRequest, oResponse, info);
+        servletRequestContext.setServletRequest(request);
+        servletRequestContext.setServletResponse(response);
+        //set the max request size if applicable
+        if (info.getServletChain().getManagedServlet().getMaxRequestSize() > 0) {
+            exchange.setMaxEntitySize(info.getServletChain().getManagedServlet().getMaxRequestSize());
+        }
+        exchange.putAttachment(ServletRequestContext.ATTACHMENT_KEY, servletRequestContext);
+
+        exchange.startBlocking(new ServletBlockingHttpExchange(exchange));
+        servletRequestContext.setServletPathMatch(info);
+
+        try {
+            dispatchRequest(exchange, servletRequestContext, info.getServletChain(), DispatcherType.REQUEST);
+        } catch (Exception e) {
+            if (e instanceof RuntimeException) {
+                throw (RuntimeException) e;
+            }
+            throw new ServletException(e);
+        }
+    }
+
     //FIXME:kakonyii: This method is copied form the base class:
     private boolean isForbiddenPath(String path) {
         return path.equalsIgnoreCase("/meta-inf/")
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedServletRequestContext.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedServletRequestContext.java
index a843c0b338..e050235ae7 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedServletRequestContext.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedServletRequestContext.java
@@ -41,8 +41,8 @@ public class ConvergedServletRequestContext extends ServletRequestContext{
     private ServletResponse servletResponse;
     private ServletRequest servletRequest;
 
-    public ConvergedServletRequestContext(Deployment deployment, ConvergedHttpServletRequestFacade originalRequest,
-            ConvergedHttpServletResponseFacade originalResponse, ServletPathMatch originalServletPathMatch) {
+    public ConvergedServletRequestContext(final Deployment deployment, final ConvergedHttpServletRequestFacade originalRequest,
+            final ConvergedHttpServletResponseFacade originalResponse, final ServletPathMatch originalServletPathMatch) {
         super(deployment, originalRequest.getHttpServletRequestDelegated(), originalResponse.getHttpServletResponseDelegated(), originalServletPathMatch);
         this.originalRequest = originalRequest;
         this.originalResponse = originalResponse;
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedSessionRestoringHandler.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedSessionRestoringHandler.java
index ba5a87e21f..180e0c76a2 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedSessionRestoringHandler.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/handlers/ConvergedSessionRestoringHandler.java
@@ -30,6 +30,7 @@
 import javax.servlet.http.HttpSessionEvent;
 
 import org.mobicents.servlet.sip.startup.ConvergedServletContextImpl;
+import org.wildfly.extension.undertow.UndertowLogger;
 
 import io.undertow.server.HttpHandler;
 import io.undertow.server.session.Session;
@@ -105,7 +106,9 @@ public void stop() {
             sessionPersistenceManager.persistSessions(deploymentName, objectData);
             data.clear();
         }catch(NoSuchFieldException | IllegalAccessException e){
+            UndertowLogger.ROOT_LOGGER.warn("Exception occured during setting SessionRestoringHandler fields:",e);
             //FIXME: kakonyii: handle reflection errors or just omit them.
+            
         }finally {
             setTccl(old);
         }
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpServletRequestFacade.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpServletRequestFacade.java
index 569fca060f..dab316a806 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpServletRequestFacade.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpServletRequestFacade.java
@@ -19,6 +19,7 @@
 package org.mobicents.io.undertow.servlet.spec;
 
 import io.undertow.server.HttpServerExchange;
+import io.undertow.servlet.UndertowServletLogger;
 import io.undertow.servlet.spec.AsyncContextImpl;
 import io.undertow.servlet.spec.HttpServletRequestImpl;
 import io.undertow.servlet.spec.ServletContextImpl;
@@ -39,6 +40,7 @@
 import javax.servlet.AsyncContext;
 import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletRequest;
@@ -63,7 +65,7 @@ public class ConvergedHttpServletRequestFacade implements HttpServletRequest{
     private final ServletContextImpl originalServletContext;
     private ConvergedServletContextImpl servletContext;
 
-    public ConvergedHttpServletRequestFacade(HttpServletRequestImpl httpServletRequest, ConvergedServletContextImpl servletContext){
+    public ConvergedHttpServletRequestFacade(HttpServletRequestImpl httpServletRequest, final ConvergedServletContextImpl servletContext){
         this.httpServletRequest = httpServletRequest;
         this.originalServletContext = httpServletRequest.getServletContext();
         this.servletContext = servletContext;
@@ -401,8 +403,8 @@ public int getLocalPort() {
     }
 
     @Override
-    public ServletContextImpl getServletContext() {
-        return httpServletRequest.getServletContext();
+    public ServletContext getServletContext() {
+        return servletContext;
     }
 
     @Override
@@ -462,6 +464,7 @@ void asyncRequestDispatched() {
             asyncRequestDispatched.invoke(httpServletRequest, null);
             asyncRequestDispatched.setAccessible(false);
         }catch(NoSuchMethodException | InvocationTargetException | IllegalAccessException e){
+            UndertowServletLogger.REQUEST_LOGGER.warn("Exception occured during invoking HttpServletRequestImpl.asyncRequestDispatched() method using reflection:",e);
             //FIXME: kakonyii: handle reflection errors or just omit them.
         }
 
@@ -491,4 +494,13 @@ public String getOriginalQueryString() {
     public HttpServletRequestImpl getHttpServletRequestDelegated() {
         return httpServletRequest;
     }
+
+    @Override
+    public String toString() {
+        return "ConvergedHttpServletRequestFacade [ " + getMethod() + ' ' + getRequestURI() + " ]";
+    }
+
+    public void clearAttributes() {
+        httpServletRequest.clearAttributes();
+    }
 }
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpServletResponseFacade.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpServletResponseFacade.java
index 5771b02970..0178b11f71 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpServletResponseFacade.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpServletResponseFacade.java
@@ -26,11 +26,13 @@
 import java.util.Locale;
 
 import io.undertow.server.HttpServerExchange;
+import io.undertow.servlet.UndertowServletLogger;
 import io.undertow.servlet.spec.HttpServletResponseImpl;
 import io.undertow.servlet.spec.ServletContextImpl;
 import io.undertow.util.HttpString;
 import io.undertow.util.RedirectBuilder;
 
+import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
@@ -209,6 +211,7 @@ boolean isIgnoredFlushPerformed() {
             result=(boolean)isIgnoredFlushPerformed.invoke(httpServletResponse, null);
             isIgnoredFlushPerformed.setAccessible(false);
         }catch(NoSuchMethodException | InvocationTargetException | IllegalAccessException e){
+            UndertowServletLogger.ROOT_LOGGER.warn("Exception occured during invoking HttpServletResponseImpl.isIgnoredFlushPerformed() method using reflection:",e);
             //FIXME: kakonyii: handle reflection errors or just omit them.
         }
         return result;
@@ -223,6 +226,7 @@ void setIgnoredFlushPerformed(boolean ignoredFlushPerformed) {
             setIgnoredFlushPerformed.invoke(httpServletResponse, ignoredFlushPerformed);
             setIgnoredFlushPerformed.setAccessible(false);
         }catch(NoSuchMethodException | InvocationTargetException | IllegalAccessException e){
+            UndertowServletLogger.ROOT_LOGGER.warn("Exception occured during invoking HttpServletResponseImpl.setIgnoredFlushPerformed() method using reflection:",e);
             //FIXME: kakonyii: handle reflection errors or just omit them.
         }
     }
@@ -297,8 +301,8 @@ public void setServletContext(final ConvergedServletContextImpl servletContext)
         httpServletResponse.setServletContext(servletContext.getDelegatedContext());
     }
 
-    public ServletContextImpl getServletContext() {
-        return httpServletResponse.getServletContext();
+    public ServletContext getServletContext() {
+        return servletContext;
     }
 
     public String encodeURL(String url) {
@@ -325,7 +329,7 @@ public String encodeRedirectURL(String url) {
         if (isEncodeable(toAbsolute(url))) {
             return originalServletContext.getSessionConfig().rewriteUrl(url, servletContext.getSession(originalServletContext, httpServletResponse.getExchange(), true).getId());
         } else {
-            return (url);
+            return url;
         }
     }
 
@@ -394,6 +398,7 @@ protected boolean isEncodeable(final String location) {
             result= (boolean) isEncodeable.invoke(httpServletResponse, location);
             isEncodeable.setAccessible(false);
         }catch(NoSuchMethodException | InvocationTargetException | IllegalAccessException e){
+            UndertowServletLogger.ROOT_LOGGER.warn("Exception occured during invoking HttpServletResponseImpl.isEncodeable() method using reflection:",e);
             //FIXME: kakonyii: handle reflection errors or just omit them.
         }
         return result;
diff --git a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpSessionFacade.java b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpSessionFacade.java
index eca5b3dcf8..7376fbe75b 100644
--- a/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpSessionFacade.java
+++ b/containers/sip-servlets-as8/src/main/java/org/mobicents/io/undertow/servlet/spec/ConvergedHttpSessionFacade.java
@@ -200,4 +200,9 @@ public void removeValue(String name) {
     public boolean isNew() {
         return httpSessionDelegate.isNew();
     }
+
+    public Session getSession() {
+        return httpSessionDelegate.getSession();
+    }
+
 }