[juneau] branch master updated: REST refactoring.

[jamesbognar]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 5120823  REST refactoring.
5120823 is described below

commit 5120823f2b47149676ac3be387b899106c072c3a
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Mon Jan 11 17:33:27 2021 -0500

    REST refactoring.
---
 .../src/main/java/org/apache/juneau/rest/RestObject.java             | 5 ++++-
 .../src/main/java/org/apache/juneau/rest/RestServlet.java            | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestObject.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestObject.java
index 42c2aa8..8e1764b 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestObject.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestObject.java
@@ -39,7 +39,6 @@ import org.apache.juneau.rest.annotation.*;
  */
 public abstract class RestObject {
 
-       private Logger logger = Logger.getLogger(getClass().getName());
        private AtomicReference<RestContext> context = new AtomicReference<>();
 
        
//-----------------------------------------------------------------------------------------------------------------
@@ -139,6 +138,10 @@ public abstract class RestObject {
         * @param msg The message to log.
         */
        protected void doLog(Level level, Throwable cause, Supplier<String> 
msg) {
+               RestContext c = context.get();
+               Logger logger = c == null ? null : c.getLogger();
+               if (logger == null)
+                       logger = Logger.getLogger(getClass().getName());
                logger.log(level, cause, msg);
        }
 
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 06d0e13..99d9dd8 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
@@ -46,7 +46,6 @@ public abstract class RestServlet extends HttpServlet {
 
        private AtomicReference<RestContext> context = new AtomicReference<>();
        private AtomicReference<Exception> initException = new 
AtomicReference<>();
-       private Logger logger = Logger.getLogger(getClass().getName());
 
        @Override /* Servlet */
        public synchronized void init(ServletConfig servletConfig) throws 
ServletException {
@@ -249,6 +248,10 @@ public abstract class RestServlet extends HttpServlet {
         * @param msg The message to log.
         */
        protected void doLog(Level level, Throwable cause, Supplier<String> 
msg) {
+               RestContext c = context.get();
+               Logger logger = c == null ? null : c.getLogger();
+               if (logger == null)
+                       logger = Logger.getLogger(getClass().getName());
                logger.log(level, cause, msg);
        }