You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by cz...@apache.org on 2015/08/10 10:46:29 UTC

svn commit: r1694990 - /felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java

Author: cziegeler
Date: Mon Aug 10 08:46:29 2015
New Revision: 1694990

URL: http://svn.apache.org/r1694990
Log:
FELIX-5000 : Potential NPE when reading metatype info due to FELIX-4973

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

Modified: felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java?rev=1694990&r1=1694989&r2=1694990&view=diff
==============================================================================
--- felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java (original)
+++ felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java Mon Aug 10 08:46:29 2015
@@ -189,7 +189,8 @@ public class MetaTypeInformationImpl imp
                 }
 
                 // get ocd for the reference, ignore designate if none
-                OCD ocd = (OCD) md.getObjectClassDefinitions().get(ocdRef);
+                final Map map = md.getObjectClassDefinitions();
+                OCD ocd = (OCD) (map == null ? null : map.get(ocdRef));
                 if (ocd == null)
                 {
                     continue;