move hash handler before cache

code4craft · Jul 16, 2013 · f3b2b40 · f3b2b40
1 parent 6867732
commit f3b2b40
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/server/src/main/java/us/codecraft/blackhole/answer/PostAnswerHandler.java b/server/src/main/java/us/codecraft/blackhole/answer/PostAnswerHandler.java
@@ -1,7 +1,6 @@
 package us.codecraft.blackhole.answer;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedList;
@@ -16,15 +15,6 @@ public class PostAnswerHandler extends AbstractAnswerHandler implements Initiali
 
     private List<AnswerProvider> answerProviders;
 
-    @Autowired
-    private AnswerPatternProvider answerPatternProvider;
-
-    @Autowired
-    private TempAnswerProvider tempAnswerContainer;
-
-    @Autowired
-    private SafeHostAnswerProvider safeHostAnswerProvider;
-
     /*
      * (non-Javadoc)
      *
@@ -38,9 +28,6 @@ public void afterPropertiesSet() throws Exception {
 
     public void regitestProviders() {
         answerProviders = new LinkedList<AnswerProvider>();
-        answerProviders.add(tempAnswerContainer);
-        answerProviders.add(answerPatternProvider);
-        answerProviders.add(safeHostAnswerProvider);
     }
 
     @Override

diff --git a/server/src/main/java/us/codecraft/blackhole/answer/PreAnswerHandler.java b/server/src/main/java/us/codecraft/blackhole/answer/PreAnswerHandler.java
@@ -22,7 +22,17 @@ public class PreAnswerHandler extends AbstractAnswerHandler implements Initializ
 	@Autowired
 	private CustomAnswerPatternProvider customAnswerPatternProvider;
 
-	/*
+    @Autowired
+    private AnswerPatternProvider answerPatternProvider;
+
+    @Autowired
+    private TempAnswerProvider tempAnswerContainer;
+
+    @Autowired
+    private SafeHostAnswerProvider safeHostAnswerProvider;
+
+
+    /*
 	 * (non-Javadoc)
 	 * 
 	 * @see
@@ -37,6 +47,9 @@ public void regitestProviders() {
 		answerProviders = new LinkedList<AnswerProvider>();
 		answerProviders.add(customTempAnswerProvider);
 		answerProviders.add(customAnswerPatternProvider);
+        answerProviders.add(tempAnswerContainer);
+        answerProviders.add(answerPatternProvider);
+        answerProviders.add(safeHostAnswerProvider);
 	}
 
     @Override

diff --git a/server/src/main/java/us/codecraft/blackhole/config/ZonesFileLoader.java b/server/src/main/java/us/codecraft/blackhole/config/ZonesFileLoader.java
@@ -118,7 +118,6 @@ public void readConfig(String filename) {
 	@Override
 	public void reload() {
 		readConfig(Configure.getZonesFilename());
-		cacheManager.clearCache();
 	}
 
 	/*