You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/12/30 16:27:31 UTC
juneau git commit: RestServlet cleanup
Repository: juneau
Updated Branches:
refs/heads/master c06b7b0aa -> 5125676fd
RestServlet cleanup
Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/5125676f
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/5125676f
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/5125676f
Branch: refs/heads/master
Commit: 5125676fd3fec7f4f7aa0a50bf0384901ecf1da6
Parents: c06b7b0
Author: JamesBognar <ja...@apache.org>
Authored: Sat Dec 30 11:27:28 2017 -0500
Committer: JamesBognar <ja...@apache.org>
Committed: Sat Dec 30 11:27:28 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/juneau/rest/RestServlet.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juneau/blob/5125676f/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
index 15119d1..cfe4fe3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -37,7 +37,7 @@ public abstract class RestServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
- private RestContextBuilder builder;
+ private volatile RestContextBuilder builder;
private RestContext context;
private volatile boolean isInitialized = false;
private Exception initException;
@@ -46,10 +46,10 @@ public abstract class RestServlet extends HttpServlet {
@Override /* Servlet */
public final synchronized void init(ServletConfig servletConfig) throws ServletException {
try {
- RestContextBuilder rsc = new RestContextBuilder(servletConfig, this.getClass(), null);
- rsc.init(this);
+ builder = new RestContextBuilder(servletConfig, this.getClass(), null);
+ builder.init(this);
super.init(servletConfig);
- RestContext context = createContext(rsc);
+ RestContext context = createContext(builder);
context.postInit();
context.postInitChildFirst();
} catch (RestException e) {