Author: mnuttall
Date: Thu Jun 27 11:00:57 2013
New Revision: 1497298
URL: http://svn.apache.org/r1497298
Log:
Aries-1085: Rare NPE in jndi ContextHelper.getInitialContextUsingBuilder() -
small extra diagnostic.
Modified:
aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java
Modified:
aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java?rev=1497298&r1=1497297&r2=1497298&view=diff
==============================================================================
---
aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java
(original)
+++
aries/trunk/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java
Thu Jun 27 11:00:57 2013
@@ -21,6 +21,8 @@ package org.apache.aries.jndi;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Hashtable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.naming.Context;
import javax.naming.NamingException;
@@ -210,6 +212,8 @@ public final class ContextHelper {
return provider;
}
+ private static final Logger logger =
Logger.getLogger(ContextHelper.class.getName());
+
private static ContextProvider getInitialContextUsingBuilder(BundleContext
context,
Hashtable<?,
?> environment)
throws NamingException {
@@ -230,6 +234,9 @@ public final class ContextHelper {
} catch (NamingException ne) {
// TODO: log
// ignore this, if the builder fails we want to move onto
the next one
+ } catch (NullPointerException npe) {
+ logger.log(Level.SEVERE, "NPE caught in
ContextHelper.getInitialContextUsingBuilder. context=" + context + " ref=" +
ref);
+ throw npe;
}
if (factory != null) {
