svn commit: r1074087 - /felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java

[fmeschbe]

Author: fmeschbe
Date: Thu Feb 24 09:39:03 2011
New Revision: 1074087

URL: http://svn.apache.org/viewvc?rev=1074087&view=rev
Log:
FELIX-2860 Prevent NPE if no *.properties entries providing localization can be 
found in the bundle

Modified:
    
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java

Modified: 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java?rev=1074087&r1=1074086&r2=1074087&view=diff
==============================================================================
--- 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
 (original)
+++ 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
 Thu Feb 24 09:39:03 2011
@@ -124,21 +124,25 @@ public class DefaultMetaTypeProvider imp
                 pattern = localePrefix.substring( lastSlash + 1 );
             }
 
-            Enumeration entries = getBundle().findEntries( path, pattern + 
"*.properties", false );
             TreeSet localeSet = new TreeSet();
-            while ( entries.hasMoreElements() )
+
+            Enumeration entries = getBundle().findEntries( path, pattern + 
"*.properties", false );
+            if ( entries != null )
             {
-                URL url = ( URL ) entries.nextElement();
-                String name = url.getPath();
-                name = name.substring( name.lastIndexOf( '/' ) + 1 + 
pattern.length(), name.length()
-                    - ".properties".length() );
-                if ( name.startsWith( "_" ) )
-                {
-                    name = name.substring( 1 );
-                }
-                if ( name.length() > 0 )
+                while ( entries.hasMoreElements() )
                 {
-                    localeSet.add( name );
+                    URL url = ( URL ) entries.nextElement();
+                    String name = url.getPath();
+                    name = name.substring( name.lastIndexOf( '/' ) + 1 + 
pattern.length(), name.length()
+                        - ".properties".length() );
+                    if ( name.startsWith( "_" ) )
+                    {
+                        name = name.substring( 1 );
+                    }
+                    if ( name.length() > 0 )
+                    {
+                        localeSet.add( name );
+                    }
                 }
             }