Merge pull request #39 from spdx/npeupgrader

Fix NPE in CompatibilityUpgrader

Author: goneall

src/main/java/org/spdx/spdxRdfStore/CompatibilityUpgrader.java

@@ -132,7 +132,8 @@ private static void upgradeHasFiles(Model model, String documentNamespace) {
 	            	Resource existingRelationship = stmt.getObject().asResource();
 	            	Resource relatedElement = existingRelationship.getPropertyResourceValue(model.createProperty(SpdxConstants.SPDX_NAMESPACE + SpdxConstants.PROP_RELATED_SPDX_ELEMENT));
 	            	Resource relationshipType = existingRelationship.getPropertyResourceValue(model.createProperty(SpdxConstants.SPDX_NAMESPACE + SpdxConstants.PROP_RELATIONSHIP_TYPE));
-	            	if (relatedElement.getURI().equals(file.getURI()) &&
+	            	if (relatedElement.isURIResource() && file.isURIResource() && relationshipType.isURIResource() &&
+	            			relatedElement.getURI().equals(file.getURI()) &&
 	            			relationshipType.getURI().equals(RelationshipType.CONTAINS.getIndividualURI())) {
 	            		foundContainsRelationships.add(stmt);
             		}
@@ -292,7 +293,7 @@ private static void upgradeArtifactOf(Model model, String documentNamespace) thr
 	                statementsToRemove.add(iter.next());
 	            }
 	            Resource pkg = convertDoapProjectToSpdxPackage(model, doapProject, docNamespace + idPrefix + Integer.toString(nextSpdxIdNum));
-	            if (!addedDoapProjects.contains(pkg.getURI())) {
+	            if (pkg.isURIResource() && !addedDoapProjects.contains(pkg.getURI())) {
 	                addedDoapProjects.add(pkg.getURI());
 	                nextSpdxIdNum = getNexId(model, docNamespace, idPrefix, nextSpdxIdNum);
 	                Resource relationship = createRelationship(model, pkg, RelationshipType.GENERATED_FROM);