diff options
| author | Raymond Auge | 2018-01-20 06:24:22 +0000 |
|---|---|---|
| committer | Raymond Auge | 2018-01-22 15:55:42 +0000 |
| commit | 0537d998171c333d7450eaf0df7a5d2b999a328a (patch) | |
| tree | cb4254d6b4159b7bca659e4783bdeff5d1a2e498 /bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java | |
| parent | 8640d436cb326bf2a59c322d59d4d0a1ff0763e3 (diff) | |
| download | rt.equinox.bundles-0537d998171c333d7450eaf0df7a5d2b999a328a.tar.gz rt.equinox.bundles-0537d998171c333d7450eaf0df7a5d2b999a328a.tar.xz rt.equinox.bundles-0537d998171c333d7450eaf0df7a5d2b999a328a.zip | |
Bug 530069 - [http servlet] During dispatching, javax.servlet.include.context_path attribute value isn't equal to return value of getContextPath
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
Signed-off-by: Dante Wang <dante.wang@liferay.com>
Change-Id: I2a555deefe078a2b225985fb64411e46a9142c74
Diffstat (limited to 'bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java index 6e30ca04a..7988a0802 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java @@ -85,7 +85,7 @@ public class DispatchTargets { RequestAttributeSetter setter = new RequestAttributeSetter(originalRequest); if (dispatcherType == DispatcherType.INCLUDE) { - setter.setAttribute(RequestDispatcher.INCLUDE_CONTEXT_PATH, contextController.getContextPath()); + setter.setAttribute(RequestDispatcher.INCLUDE_CONTEXT_PATH, contextController.getFullContextPath()); setter.setAttribute(RequestDispatcher.INCLUDE_PATH_INFO, getPathInfo()); setter.setAttribute(RequestDispatcher.INCLUDE_QUERY_STRING, getQueryString()); setter.setAttribute(RequestDispatcher.INCLUDE_REQUEST_URI, getRequestURI()); @@ -198,7 +198,7 @@ public class DispatchTargets { String value = string; if (value == null) { - value = SIMPLE_NAME + '[' + contextController.getFullContextPath() + requestURI + (queryString != null ? '?' + queryString : "") + ", " + endpointRegistration.toString() + ']'; //$NON-NLS-1$ + value = SIMPLE_NAME + '[' + contextController.getFullContextPath() + requestURI + (queryString != null ? '?' + queryString : "") + ", " + endpointRegistration.toString() + ']'; //$NON-NLS-1$ //$NON-NLS-2$ string = value; } |