Changeset 1338

Timestamp:

05/18/11 15:20:41 (13 years ago)

Author:

twagoo

Message:

ComponentSpecExpander?: deal with unresolved component id's

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/CMDComponentSpecExpander.java (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/CMDComponentSpecExpander.java

@@ -28 +28 @@
                 // Use uncached components and profiles, because we expand and thus change them this change should not be in the cache.
                 CMDComponentSpec spec = getUncachedComponent(componentId);
-                CMDComponentType nested = getComponentTypeOfAComponent(spec);
-                expandNestedComponent(nested.getCMDComponent());
-                overwriteAttributes(cmdComponentType, nested);
-                expanded.add(nested);
+                if (spec != null) {
+                    CMDComponentType nested = getComponentTypeOfAComponent(spec);
+                    expandNestedComponent(nested.getCMDComponent());
+                    overwriteAttributes(cmdComponentType, nested);
+                    expanded.add(nested);
+                } else {
+                    // Spec could not be resolved
+                    LOG.warn("Could not resolve referenced component with id " + componentId);
+                    // Add spec itself, without futher expanding
+                    expanded.add(cmdComponentType);
+                }
             } else {
+                // No id = embedded component
                 expandNestedComponent(cmdComponentType.getCMDComponent());
                 expanded.add(cmdComponentType);//no attributes overwritten