From 2cbd91c6c05921f735ad2408cea9c345adc2e2e3 Mon Sep 17 00:00:00 2001
From: shikui <liushk@foxmail.com>
Date: Mon, 3 Aug 2015 17:46:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E5=B0=86http=20304=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=BA=E6=AD=A3=E5=B8=B8=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E5=BA=94=E4=B8=BAETag=EF=BC=8C=E8=80=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AFETags?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、将http 304作为正常状态处理，避免大量304错误写到日志文件里；2、应为ETag，而不是ETags
---
 src/main/java/org/wltea/analyzer/dic/Monitor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/wltea/analyzer/dic/Monitor.java b/src/main/java/org/wltea/analyzer/dic/Monitor.java
index ee1d99c..b1f0cbd 100644
--- a/src/main/java/org/wltea/analyzer/dic/Monitor.java
+++ b/src/main/java/org/wltea/analyzer/dic/Monitor.java
@@ -62,15 +62,15 @@ public class Monitor implements Runnable {
 			response = httpclient.execute(head);
 			
 			//返回200 才做操作
-			if(response.getStatusLine().getStatusCode()==200){
+			if(response.getStatusLine().getStatusCode()==200 || response.getStatusLine().getStatusCode()==304){
 			
 				if (!response.getLastHeader("Last-Modified").getValue().equalsIgnoreCase(last_modified)
-					||!response.getLastHeader("ETags").getValue().equalsIgnoreCase(eTags)) {
+					||!response.getLastHeader("ETag").getValue().equalsIgnoreCase(eTags)) {
 
 					// 远程词库有更新,需要重新加载词典，并修改last_modified,eTags
 					Dictionary.getSingleton().reLoadMainDict();
 					last_modified = response.getLastHeader("Last-Modified")==null?null:response.getLastHeader("Last-Modified").getValue();
-					eTags = response.getLastHeader("ETags")==null?null:response.getLastHeader("ETags").getValue();
+					eTags = response.getLastHeader("ETag")==null?null:response.getLastHeader("ETag").getValue();
 				}
 			}else{
 				Dictionary.logger.info("remote_ext_dict {} return bad code {}" , location , response.getStatusLine().getStatusCode() );

From f5aef261d3dde7506075bb0a1101edc3402a2851 Mon Sep 17 00:00:00 2001
From: shikui <liushk@foxmail.com>
Date: Mon, 3 Aug 2015 17:50:44 +0800
Subject: [PATCH 2/2] update elasticsearch to 1.6.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f099371..2f61675 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>1.6.0</elasticsearch.version>
+        <elasticsearch.version>1.6.2</elasticsearch.version>
     </properties>
 
   <repositories>