commit 836713228c4a5a6d12beea8524d1f1b2f34a868e
author Carsten Ziegeler <cziegeler@apache.org> Mon Aug 10 08:46:29 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Mon Aug 10 08:46:29 2015 +0000
tree c6d33380443b01705a40edec1f7165edbd515510
parent 45a1e2fe25dc373cdf7bcb38041ae7f27cebf336

FELIX-5000 : Potential NPE when reading metatype info due to FELIX-4973

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1694990 13f79535-47bb-0310-9956-ffa450edef68

metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java

diff --git a/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java b/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
index ffafa7e..11eb561 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
@@ -189,7 +189,8 @@
                 }
 
                 // 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;