*) httpdFileHandler templateCache can now be disabled

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@708 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/http/httpdFileHandler.java

@@ -74,6 +74,7 @@
 
 package de.anomic.http;
 
+import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -97,6 +98,7 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.zip.GZIPOutputStream;
 
+import de.anomic.plasma.plasmaSwitchboard;
 import de.anomic.server.serverClassLoader;
 import de.anomic.server.serverCodings;
 import de.anomic.server.serverCore;
@@ -126,6 +128,12 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http
      */
     private static final HashMap templateCache = new HashMap();
     
+    public static boolean useTemplateCache = false;
+    
+    static {
+        useTemplateCache = plasmaSwitchboard.getSwitchboard().getConfig("enableTemplateCache","true").equalsIgnoreCase("true");
+    }
+    
     public httpdFileHandler(serverSwitch switchboard) {
         this.switchboard = switchboard;
         
@@ -474,6 +482,7 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http
                     try {
                         // do fileCaching here
                         byte[] templateContent = null;
+                        if (useTemplateCache) {
                             long fileSize = localizedFile.length();
                             if (fileSize <= 512*1024) {
                                 SoftReference ref = (SoftReference) templateCache.get(localizedFile);
@@ -501,7 +510,10 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http
                                 fis = new ByteArrayInputStream(templateContent);                            
                                 templateContent = null;
                             } else {
-                            fis = new FileInputStream(localizedFile);
+                                fis = new BufferedInputStream(new FileInputStream(localizedFile));
+                            }
+                        } else {
+                            fis = new BufferedInputStream(new FileInputStream(localizedFile));
                         }
 
                         o = new ByteArrayOutputStream();

yacy.init

@@ -518,3 +518,5 @@ crawler.MaxIdleThreads = 7
 crawler.MinIdleThreads = 5
 
 useYacyReferer = true
+
+enableTemplateCache = true