diff --git a/ccm-cms/web/templates/ccm-cms/content-section/admin/image_select.jsp b/ccm-cms/web/templates/ccm-cms/content-section/admin/image_select.jsp
index b06610ec7..cd580dd54 100644
--- a/ccm-cms/web/templates/ccm-cms/content-section/admin/image_select.jsp
+++ b/ccm-cms/web/templates/ccm-cms/content-section/admin/image_select.jsp
@@ -13,18 +13,17 @@
// Restore the wrapped request
- request = DispatcherHelper.getRequest();
+ HttpServletRequest myRequest = DispatcherHelper.getRequest();
DispatcherHelper.cacheDisable(response);
- ContentSection section =
- ContentSectionServlet.getContentSection(request);
+ ContentSection section = ContentSectionServlet.getContentSection(myRequest);
- if (! ContentSectionServlet.checkAdminAccess(request, section)) {
+ if (! ContentSectionServlet.checkAdminAccess(myRequest, section)) {
throw new com.arsdigita.cms.dispatcher.AccessDeniedException();
}
- RequestContext context = DispatcherHelper.getRequestContext(request);
+ RequestContext context = DispatcherHelper.getRequestContext(myRequest);
imageSelectPage.init();
- imageSelectPage.dispatch(request, response, context);
+ imageSelectPage.dispatch(myRequest, response, context);
diff --git a/ccm-cms/web/templates/ccm-cms/content-section/admin/index.jsp b/ccm-cms/web/templates/ccm-cms/content-section/admin/index.jsp
index 7613c5808..19fedbc6a 100755
--- a/ccm-cms/web/templates/ccm-cms/content-section/admin/index.jsp
+++ b/ccm-cms/web/templates/ccm-cms/content-section/admin/index.jsp
@@ -11,26 +11,26 @@
private ContentSectionPage sectionPage = new ContentSectionPage();
+ // private HttpServletRequest myRequest = DispatcherHelper.getRequest();
// Restore the wrapped request
- request = DispatcherHelper.getRequest();
+ HttpServletRequest myRequest = DispatcherHelper.getRequest();
DispatcherHelper.cacheDisable(response);
- ContentSection section =
- ContentSectionServlet.getContentSection(request);
+ ContentSection section = ContentSectionServlet.getContentSection(myRequest);
if (Web.getWebContext().getUser() == null) {
- throw new LoginSignal(request);
- } else if (! ContentSectionServlet.checkAdminAccess(request, section)) {
+ throw new LoginSignal(myRequest);
+ } else if (! ContentSectionServlet.checkAdminAccess(myRequest, section)) {
throw new com.arsdigita.cms.dispatcher.AccessDeniedException();
}
- RequestContext context = DispatcherHelper.getRequestContext(request);
+ RequestContext context = DispatcherHelper.getRequestContext(myRequest);
sectionPage.init();
- sectionPage.dispatch(request, response, context);
+ sectionPage.dispatch(myRequest, response, context);
diff --git a/ccm-cms/web/templates/ccm-cms/content-section/admin/item.jsp b/ccm-cms/web/templates/ccm-cms/content-section/admin/item.jsp
index 78d16bb67..40eb8c13a 100755
--- a/ccm-cms/web/templates/ccm-cms/content-section/admin/item.jsp
+++ b/ccm-cms/web/templates/ccm-cms/content-section/admin/item.jsp
@@ -22,18 +22,18 @@
s_log.debug("entered item.jsp's service method");
// Restore the wrapped request
- request = DispatcherHelper.getRequest();
+ HttpServletRequest myRequest = DispatcherHelper.getRequest();
DispatcherHelper.cacheDisable(response);
- request = DispatcherHelper.getRequest();
+ // ?? just doubles the initial line
+ // request = DispatcherHelper.getRequest();
- ContentSection section =
- ContentSectionServlet.getContentSection(request);
+ ContentSection section = ContentSectionServlet.getContentSection(myRequest);
if (Web.getWebContext().getUser() == null) {
- throw new LoginSignal(request);
- } else if (! ContentSectionServlet.checkAdminAccess(request, section)) {
+ throw new LoginSignal(myRequest);
+ } else if (! ContentSectionServlet.checkAdminAccess(myRequest, section)) {
throw new com.arsdigita.cms.dispatcher.AccessDeniedException();
}
@@ -52,14 +52,14 @@
}
s_log.debug("Starting dispatch process...");
- RequestContext context = DispatcherHelper.getRequestContext(request);
+ RequestContext context = DispatcherHelper.getRequestContext(myRequest);
if(itemPage == null) {
s_log.warn("WARNING: itemPage is NULL");
}
else {
s_log.info("ALL OK: itemPage is not null");
}
- itemPage.dispatch(request, response, context);
+ itemPage.dispatch(myRequest, response, context);
s_log.debug("exited item.jsp's service method");
diff --git a/ccm-cms/web/templates/ccm-cms/content-section/admin/search.jsp b/ccm-cms/web/templates/ccm-cms/content-section/admin/search.jsp
index 374f69457..57e3322f6 100755
--- a/ccm-cms/web/templates/ccm-cms/content-section/admin/search.jsp
+++ b/ccm-cms/web/templates/ccm-cms/content-section/admin/search.jsp
@@ -13,20 +13,19 @@
// Restore the wrapped request
- request = DispatcherHelper.getRequest();
+ HttpServletRequest myRequest = DispatcherHelper.getRequest();
DispatcherHelper.cacheDisable(response);
- ContentSection section =
- ContentSectionServlet.getContentSection(request);
+ ContentSection section = ContentSectionServlet.getContentSection(myRequest);
- if (! ContentSectionServlet.checkAdminAccess(request, section)) {
+ if (! ContentSectionServlet.checkAdminAccess(myRequest, section)) {
throw new com.arsdigita.cms.dispatcher.AccessDeniedException();
}
- RequestContext context = DispatcherHelper.getRequestContext(request);
+ RequestContext context = DispatcherHelper.getRequestContext(myRequest);
sectionPage.init();
- sectionPage.dispatch(request, response, context);
+ sectionPage.dispatch(myRequest, response, context);