[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 d0b778a  REST refactoring.
d0b778a is described below

commit d0b778a0d0c5841cc4de6c10dd7daeea82739b3f
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Mon Jan 11 16:49:27 2021 -0500

    REST refactoring.
---
 .../src/main/java/org/apache/juneau/rest/RestContextBuilder.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 567b087..5fa0ccd 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -2564,7 +2564,7 @@ public class RestContextBuilder extends 
BeanContextBuilder implements ServletCon
 
        @Override /* ServletConfig */
        public ServletContext getServletContext() {
-               return inner == null ? null : inner.getServletContext();
+               return inner != null ? inner.getServletContext() : 
parentContext != null ? parentContext.builder.getServletContext() : null;
        }
 
        @Override /* ServletConfig */