litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove call to FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp from VitroHttpServlet, since was getting called more than once per request (since there are multiple servlets that are called for a single request). Use calls from the jsps instead.

Browse source
This commit is contained in:
rjy7 2010-06-02 17:29:12 +00:00
parent 037ff45736
commit 55e68bb232
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java
View file

@ -64,14 +64,6 @@ public class VitroHttpServlet extends HttpServlet
request.getAttribute("webappDaoFactory") == null ){ request.getAttribute("webappDaoFactory") == null ){
log.warn("request scope was not prepared by VitroRequestPrep"); log.warn("request scope was not prepared by VitroRequestPrep");
} }
// TEMPORARY for transition from JSP to FreeMarker. Once transition
// is complete and no more pages are generated in JSP, this can be removed.
// Do this if FreeMarker is configured (i.e., not Datastar) and if we are not in
// a FreeMarkerHttpServlet, which will generate identity, menu, and footer from the page template.
if ( FreeMarkerHttpServlet.isConfigured() && !(this instanceof FreeMarkerHttpServlet) ) {
FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request, response);
}
} }

1
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java
View file

@ -348,6 +348,7 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet {
// a FreeMarkerHttpServlet, which will generate identity, menu, and footer from the page template. // a FreeMarkerHttpServlet, which will generate identity, menu, and footer from the page template.
// It's a static method because it needs to be called from JSPs that don't go through a servlet. // It's a static method because it needs to be called from JSPs that don't go through a servlet.
public static void getFreeMarkerComponentsForJsp(HttpServletRequest request, HttpServletResponse response) { public static void getFreeMarkerComponentsForJsp(HttpServletRequest request, HttpServletResponse response) {
System.out.println("IN getFreeMarkerComponentsForJsp");
FreeMarkerComponentGenerator fcg = new FreeMarkerComponentGenerator(request, response); FreeMarkerComponentGenerator fcg = new FreeMarkerComponentGenerator(request, response);
request.setAttribute("ftl_identity", fcg.getIdentity()); request.setAttribute("ftl_identity", fcg.getIdentity());
request.setAttribute("ftl_menu", fcg.getMenu()); request.setAttribute("ftl_menu", fcg.getMenu());