From 3da80901907e1c568518e7a868df1acbf8de47ae Mon Sep 17 00:00:00 2001
From: wentch <22250530@qq.com>
Date: Tue, 5 Jan 2016 10:46:53 +0800
Subject: [PATCH]

---
 src/org/redkale/net/http/HttpPrepareServlet.java | 10 ++++++----
 src/org/redkale/net/http/HttpServlet.java        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/org/redkale/net/http/HttpPrepareServlet.java b/src/org/redkale/net/http/HttpPrepareServlet.java
index 79a74366c..b72e949a4 100644
--- a/src/org/redkale/net/http/HttpPrepareServlet.java
+++ b/src/org/redkale/net/http/HttpPrepareServlet.java
@@ -18,7 +18,9 @@ import org.redkale.watch.*;
 
 /**
  *
- * <p> 详情见: http://www.redkale.org
+ * <p>
+ * 详情见: http://www.redkale.org
+ *
  * @author zhangjx
  */
 public final class HttpPrepareServlet extends PrepareServlet<HttpRequest, HttpResponse<HttpRequest>> {
@@ -34,7 +36,7 @@ public final class HttpPrepareServlet extends PrepareServlet<HttpRequest, HttpRe
     @Override
     public void init(Context context, AnyValue config) {
         this.servlets.stream().forEach(s -> {
-            s.init(context, s.conf);
+            s.init(context, s._conf);
         });
         final WatchFactory watch = ((HttpContext) context).getWatchFactory();
         if (watch != null) {
@@ -101,7 +103,7 @@ public final class HttpPrepareServlet extends PrepareServlet<HttpRequest, HttpRe
                 strmaps.put(mapping, servlet);
             }
         }
-        servlet.conf = conf;
+        servlet._conf = conf;
         this.servlets.add(servlet);
     }
 
@@ -125,7 +127,7 @@ public final class HttpPrepareServlet extends PrepareServlet<HttpRequest, HttpRe
     public void destroy(Context context, AnyValue config) {
         this.resourceHttpServlet.destroy(context, config);
         this.servlets.stream().forEach(s -> {
-            s.destroy(context, s.conf);
+            s.destroy(context, s._conf);
         });
     }
 
diff --git a/src/org/redkale/net/http/HttpServlet.java b/src/org/redkale/net/http/HttpServlet.java
index 628893323..59c17aa9a 100644
--- a/src/org/redkale/net/http/HttpServlet.java
+++ b/src/org/redkale/net/http/HttpServlet.java
@@ -15,7 +15,7 @@ import org.redkale.util.*;
  */
 public abstract class HttpServlet extends Servlet<HttpRequest, HttpResponse<HttpRequest>> {
 
-    AnyValue conf; //当前HttpServlet的配置
+    AnyValue _conf; //当前HttpServlet的配置
 
     @Override
     public final boolean equals(Object obj) {