Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-21 00:00:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

- disable Jetty servlet defaultUseCache (prevent double caching)

Browse Source 
- include short memory status check for class cache in DefaultServlet
- remove obsolete Resource interface for Jetty8YaCyDefaultServlet
This commit is contained in:
reger 2013-11-18 03:15:45 +01:00
parent f111f30ace
commit b1dc9a6f52
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/net/yacy/http/Jetty8YaCyDefaultServlet.java
View File

@ -54,7 +54,6 @@ import org.eclipse.jetty.util.MultiPartOutputStream;
import org.eclipse.jetty.util.QuotedStringTokenizer;
import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.resource.ResourceFactory;
/* ------------------------------------------------------------ */
/**
@ -95,7 +94,7 @@ import org.eclipse.jetty.util.resource.ResourceFactory;
* </PRE>
*
*/
public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet implements ResourceFactory {
public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet {
private static final long serialVersionUID = 4900000000000001110L;

12
source/net/yacy/http/YaCyDefaultServlet.java
View File

@ -154,6 +154,7 @@ public abstract class YaCyDefaultServlet extends HttpServlet {
_dirAllowed = getInitBoolean("dirAllowed", _dirAllowed);
_pathInfoOnly = getInitBoolean("pathInfoOnly", _pathInfoOnly);
Resource.setDefaultUseCaches(false); // caching is handled internally (prevent double caching)
_relativeResourceBase = getInitParameter("relativeResourceBase");
String rb = getInitParameter("resourceBase");
@ -168,7 +169,7 @@ public abstract class YaCyDefaultServlet extends HttpServlet {
throw new UnavailableException(e.toString());
}
}
_etags = getInitBoolean("etags", _etags);
if (ConcurrentLog.isFine("FILEHANDLER")) {
@ -423,9 +424,12 @@ public abstract class YaCyDefaultServlet extends HttpServlet {
serverSwitch.class};
m = c.getMethod("respond", params);
// store the method into the cache
templateMethodCache.put(classFile, new SoftReference<Method>(m));
if (MemoryControl.shortStatus()) {
templateMethodCache.clear();
} else {
// store the method into the cache
templateMethodCache.put(classFile, new SoftReference<Method>(m));
}
} catch (final ClassNotFoundException e) {
ConcurrentLog.severe("FILEHANDLER","YaCyDefaultServlet: class " + classFile + " is missing:" + e.getMessage());
throw new InvocationTargetException(e, "class " + classFile + " is missing:" + e.getMessage());