Skip to content
This repository was archived by the owner on Dec 15, 2018. It is now read-only.

Commit 897bbc4

Browse files
committed
Update MvcContextImpl to match updated interface
1 parent 8a5ed55 commit 897bbc4

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

core/src/main/java/org/mvcspec/ozark/MvcContextImpl.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,12 @@ public void init() {
8484

8585
}
8686

87-
@Override
88-
public String getContextPath() {
89-
return servletContext.getContextPath(); // normalized by servlet
90-
}
91-
92-
@Override
93-
public String getApplicationPath() {
94-
return applicationPath;
95-
}
96-
9787
@Override
9888
public String getBasePath() {
99-
if (getApplicationPath() != null) {
100-
return getContextPath() + getApplicationPath();
89+
if (applicationPath != null) {
90+
return servletContext.getContextPath() + applicationPath;
10191
}
102-
return getContextPath();
92+
return servletContext.getContextPath();
10393
}
10494

10595
@Override

core/src/main/java/org/mvcspec/ozark/cdi/RedirectScopeManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public void controllerRedirectEvent(@Observes ControllerRedirectEvent event) {
252252
if (request.getAttribute(SCOPE_ID) != null) {
253253
if (usingCookies()) {
254254
Cookie cookie = new Cookie(COOKIE_NAME, request.getAttribute(SCOPE_ID).toString());
255-
cookie.setPath(mvc.getContextPath());
255+
cookie.setPath(request.getContextPath());
256256
cookie.setMaxAge(600);
257257
cookie.setHttpOnly(true);
258258
response.addCookie(cookie);

0 commit comments

Comments
 (0)