Author: mattmann
Date: Sat Feb 19 20:27:51 2011
New Revision: 1072433

URL: http://svn.apache.org/viewvc?rev=1072433&view=rev
Log:
- OODT-139 WIP: be a bit more accomodating in the case of SerDes causing nulls 
for pedigrees (helps integrate into more legacy OODT systems)

Modified:
    oodt/trunk/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java

Modified: 
oodt/trunk/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java?rev=1072433&r1=1072432&r2=1072433&view=diff
==============================================================================
--- 
oodt/trunk/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java 
(original)
+++ 
oodt/trunk/pcs/core/src/main/java/org/apache/oodt/pcs/pedigree/Pedigree.java 
Sat Feb 19 20:27:51 2011
@@ -159,7 +159,13 @@ public class Pedigree implements PCSMeta
    *         {@link Product}.
    */
   public List getUpstreamPedigreedProducts(Product orig) {
-    if (orig.getProductType().getName().equals(UNKNOWN)) {
+    if (orig == null
+        || (orig != null && orig.getProductType() == null)
+        || (orig != null && orig.getProductType() != null 
+            && orig.getProductType().getName() == null)
+        || (orig != null && orig.getProductType() != null
+            && orig.getProductType().getName() != null && 
+            orig.getProductType().getName().equals(UNKNOWN))) {
       return new Vector();
     }
     Metadata pMet = fm.safeGetMetadata(orig);


Reply via email to