commit 8b71e157006c073a81e6347a63f2a9fb1fb2b708
author Jeremy Hughes <hughesj@apache.org> Fri Sep 12 12:30:06 2014 +0000
committer Jeremy Hughes <hughesj@apache.org> Fri Sep 12 12:30:06 2014 +0000
tree c819f27198adc21e0d9d282b0a51acc6dccfc444
parent 5da8f5ed4ac4fba10c0d407b1fab37132665b463

ARIES-1243: Fixed NPE caused by null env passed to OSGiObjectFactoryBuilder.getObjectInstance()


git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-core@1624519 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java

diff --git a/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java b/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
index 43e5dc7..98f7e97 100644
--- a/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
+++ b/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java
@@ -49,6 +49,11 @@
                                     Name name,
                                     Context nameCtx,
                                     Hashtable<?, ?> environment) throws Exception {
+        
+        if (environment == null) {
+            environment = new Hashtable();
+        }
+        
         BundleContext callerContext = getCallerBundleContext(environment);
         if (callerContext == null) {
             return obj;
@@ -62,6 +67,11 @@
                                     Context nameCtx,
                                     Hashtable<?, ?> environment,
                                     Attributes attrs) throws Exception {
+        
+        if (environment == null) {
+            environment = new Hashtable();
+        }
+        
         BundleContext callerContext = getCallerBundleContext(environment);
         if (callerContext == null) {
             return obj;