From 08b2567e6347c8b9c12d9a32eadd93e28325e807 Mon Sep 17 00:00:00 2001
From: "Dmitry.Treskunov" <dmitry.treskunov@gmail.com>
Date: Fri, 17 Oct 2014 18:06:52 +0400
Subject: [PATCH] Try JSR356_MAPPING_PATH param before guessing servlet path

---
 .../main/java/org/atmosphere/container/JSR356Endpoint.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java b/modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java
index acb185da8d2..283886d0ff8 100644
--- a/modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java
+++ b/modules/cpr/src/main/java/org/atmosphere/container/JSR356Endpoint.java
@@ -114,7 +114,10 @@ public void onOpen(Session session, EndpointConfig endpointConfig) {
             headers.put(e.getKey(), e.getValue().size() > 0 ? e.getValue().get(0) : "");
         }
 
-        String servletPath = IOUtils.guestServletPath(framework.getAtmosphereConfig());
+        String servletPath = framework.getAtmosphereConfig().getInitParameter(ApplicationConfig.JSR356_MAPPING_PATH);
+        if (servletPath == null) {
+          servletPath = IOUtils.guestServletPath(framework.getAtmosphereConfig());
+        }
 
         URI uri = session.getRequestURI();
         String[] paths = uri.getPath() != null ? uri.getPath().split("/") : new String[]{};