Repository: tomee Updated Branches: refs/heads/master 4aa5c3a3f -> 9573042ce
add the application case to existing if block; checking map existence before calling a method on it. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ff8e9c88 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ff8e9c88 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ff8e9c88 Branch: refs/heads/master Commit: ff8e9c88c4ec116e1e7e2ff09e3365c76d36b899 Parents: 4aa5c3a Author: Thiago Veronezi <[email protected]> Authored: Mon Jul 16 10:57:38 2018 -0400 Committer: Thiago Veronezi <[email protected]> Committed: Mon Jul 16 10:57:38 2018 -0400 ---------------------------------------------------------------------- .../org/apache/openejb/assembler/classic/JndiEncBuilder.java | 4 +++- .../org/apache/openejb/core/ivm/naming/MapObjectReference.java | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ff8e9c88/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java index 53bcac8..3c287f9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java @@ -73,6 +73,7 @@ import javax.transaction.UserTransaction; import javax.validation.Validator; import javax.validation.ValidatorFactory; import javax.ws.rs.container.ResourceContext; +import javax.ws.rs.core.Application; import javax.ws.rs.core.Configuration; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Request; @@ -341,10 +342,11 @@ public class JndiEncBuilder { reference = new ObjectReference(ThreadLocalContextManager.RESOURCE_CONTEXT); } else if (Configuration.class.equals(type)) { reference = new ObjectReference(ThreadLocalContextManager.CONFIGURATION); + } else if (Application.class.equals(type)) { + reference = new ObjectReference(ThreadLocalContextManager.APPLICATION); } else { reference = new MapObjectReference(ThreadLocalContextManager.OTHERS, referenceInfo.referenceType); } - bindings.put(normalize(referenceInfo.referenceName), reference); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/ff8e9c88/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java index bbca666..4cf14f4 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java @@ -31,6 +31,10 @@ public class MapObjectReference extends Reference { } public Object getObject() throws NamingException { - return obj.get().get(key); + final Map<String, Object> theMap = obj.get(); + if (theMap == null) { + return null; + } + return theMap.get(key); } }
