another fix for when the servlet is not geonetwork

geonetwork · Jan 24, 2013 · b24e891 · b24e891
1 parent 15e5f43
commit b24e891
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/web/src/main/java/org/fao/geonet/resources/ResourceFilter.java b/web/src/main/java/org/fao/geonet/resources/ResourceFilter.java
@@ -96,8 +96,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 
 	private void initFields() throws IOException {
         servletContext = config.getServletContext();
-        appPath = servletContext.getContextPath();
-        resourcesDir = System.getProperty(servletContext.getServletContextName() + ".resources.dir");
+        appPath = new java.io.File(servletContext.getRealPath(".")).getParent();
+        resourcesDir = Resources.locateResourcesDir(config.getServletContext());
 
         defaultImage = Resources.loadResource(resourcesDir, config.getServletContext(), appPath, "images/logos/dummy.gif", new byte[0], -1);
         favicon = Resources.loadResource(resourcesDir, config.getServletContext(), appPath, "images/logos/favicon.gif", defaultImage.one(), -1);