felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r919955 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
Date Sun, 07 Mar 2010 09:52:12 GMT
Author: pderop
Date: Sun Mar  7 09:52:12 2010
New Revision: 919955

URL: http://svn.apache.org/viewvc?rev=919955&view=rev
Log:
fixed potential NullPointerException, when getting list of available Locales

Modified:
    felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java

Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java?rev=919955&r1=919954&r2=919955&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
(original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
Sun Mar  7 09:52:12 2010
@@ -133,6 +133,10 @@
         String base = (lastSlash == -1) ? m_localization : m_localization.substring(lastSlash
+ 1);
         Enumeration e = m_configDependency.getBundleContext().getBundle().findEntries(path,
             base + "*.properties", false);
+        if (e == null) {
+            return null;
+        }
+        
         TreeSet set = new TreeSet();
         while (e.hasMoreElements())
         {



Mime
View raw message