You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/02/26 13:53:41 UTC
svn commit: r748122 -
/servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiInitialContextFactoryBuilder.java
Author: gnodet
Date: Thu Feb 26 12:53:41 2009
New Revision: 748122
URL: http://svn.apache.org/viewvc?rev=748122&view=rev
Log:
Fix possible NPE
Modified:
servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiInitialContextFactoryBuilder.java
Modified: servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiInitialContextFactoryBuilder.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiInitialContextFactoryBuilder.java?rev=748122&r1=748121&r2=748122&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiInitialContextFactoryBuilder.java (original)
+++ servicemix/smx4/nmr/trunk/naming/src/main/java/org/apache/servicemix/naming/OSGiInitialContextFactoryBuilder.java Thu Feb 26 12:53:41 2009
@@ -103,13 +103,15 @@
factory = factoryBuilder.createInitialContextFactory(env);
}
if (factory == null && env != null) {
- String className = env != null ? (String) env.get(Context.INITIAL_CONTEXT_FACTORY) : null;
- try {
- factory = (InitialContextFactory) Class.forName(className).newInstance();
- } catch (Exception e) {
- NoInitialContextException ne = new NoInitialContextException("Cannot instantiate class: " + className);
- ne.setRootCause(e);
- throw ne;
+ String className = (String) env.get(Context.INITIAL_CONTEXT_FACTORY);
+ if (className != null) {
+ try {
+ factory = (InitialContextFactory) Class.forName(className).newInstance();
+ } catch (Exception e) {
+ NoInitialContextException ne = new NoInitialContextException("Cannot instantiate class: " + className);
+ ne.setRootCause(e);
+ throw ne;
+ }
}
}
if (factory == null) {