Reworked fix for ignoring /APP/ (#11192)

* Fixed potential NPE by using existing helper method
* Pass /APP/ urls also to session handlers as at least GlobalResourceHandler requires it
* Fixed test to test /APP/ instead of /APP

Change-Id: I8d913e6a5509c63f8e47813fce5751f5279ed4fc

2 files changed, 1 insertions, 10 deletions

diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index 80cadb02c1..671279219e 100644
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -115,8 +115,7 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
     @Override
     public boolean synchronizedHandleRequest(VaadinSession session,
             VaadinRequest request, VaadinResponse response) throws IOException {
-        String pathInfo = request.getPathInfo();
-        if (pathInfo.startsWith("/" + ApplicationConstants.APP_PATH + "/")) {
+        if (ServletPortletHelper.isAppRequest(request)) {
             // We do not want to handle /APP requests here, instead let it fall
             // through and produce a 404
             return false;
diff --git a/server/src/com/vaadin/server/communication/SessionRequestHandler.java b/server/src/com/vaadin/server/communication/SessionRequestHandler.java
index 14c940acf5..244cb0121d 100644
--- a/server/src/com/vaadin/server/communication/SessionRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/SessionRequestHandler.java
@@ -22,7 +22,6 @@ import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.shared.ApplicationConstants;
 
 /**
  * Handles a request by passing it to each registered {@link RequestHandler} in
@@ -51,13 +50,6 @@ public class SessionRequestHandler implements RequestHandler {
     @Override
     public boolean handleRequest(VaadinSession session, VaadinRequest request,
             VaadinResponse response) throws IOException {
-        String pathInfo = request.getPathInfo();
-        if (pathInfo.startsWith("/" + ApplicationConstants.APP_PATH + "/")) {
-            // /<APP_PATH>/ is reserved for Vaadin internal use and these
-            // requests should not be passed to session request handlers
-            return false;
-        }
-
         // Use a copy to avoid ConcurrentModificationException
         session.lock();
         ArrayList<RequestHandler> requestHandlers;