| commit | dc32dfbb649594688e7e70fbeef4a13cbdc5afd1 | [log] [tgz] |
|---|---|---|
| author | Pierre De Rop <pderop@apache.org> | Sun Mar 07 09:52:12 2010 +0000 |
| committer | Pierre De Rop <pderop@apache.org> | Sun Mar 07 09:52:12 2010 +0000 |
| tree | e8aaf43b36e5df1e7d6dd1a0c11ddd759ac7ddb6 | |
| parent | 0fd8e329fae32f61baf9b3ef140ca617d5183b99 [diff] |
fixed potential NullPointerException, when getting list of available Locales git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@919955 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java index c5af035..b82b173 100644 --- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java +++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/metatype/MetaTypeProviderImpl.java
@@ -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()) {