Merge pull request spdx#87 from timurphy/master

Add parse error details to exception message

Author: yevster

src/org/spdx/rdfparser/SpdxDocumentContainer.java

@@ -561,7 +561,7 @@ public void getExtractedLicenseInfosFromModel() throws InvalidSPDXAnalysisExcept
 
 		for (int i = 0; i < extractedAnyLicenseInfo.length; i++) {
 			if (!(extractedAnyLicenseInfo[i] instanceof ExtractedLicenseInfo)) {
-				throw new InvalidSPDXAnalysisException("Invalid type for extracted license infos");
+				throw new InvalidSPDXAnalysisException("Invalid type for extracted license infos: " + extractedAnyLicenseInfo[i]);
 			}
 			ExtractedLicenseInfo lic = (ExtractedLicenseInfo)extractedAnyLicenseInfo[i];
 			this.licenseIdToExtractedLicense.put(lic.getLicenseId(), lic);

src/org/spdx/tools/CompareSpdxDocs.java

@@ -1138,6 +1138,7 @@ protected static SpdxDocument openRdfOrTagDoc(String spdxDocFileName, List<Strin
 		}
 
 		SpdxDocument retval = null;
+		String errorDetails = "(no error details available)";
 		try {
 			// Try to open the file as a tag/value file first.
 			retval = convertTagValueToRdf(spdxDocFile, warnings);
@@ -1151,15 +1152,18 @@ protected static SpdxDocument openRdfOrTagDoc(String spdxDocFileName, List<Strin
 				retval = SPDXDocumentFactory.createSpdxDocument(spdxDocFileName);
 				logger.info("Document identified as SPDX RDF/XML.");
 			} catch (IOException e) {
+				errorDetails = e.getMessage();
 				// Ignore - unrecognized files are handled below.
 			} catch (InvalidSPDXAnalysisException e) {
+				errorDetails = e.getMessage();
 				// Ignore - unrecognized files are handled below.
 			} catch (Exception e) {
+				errorDetails = e.getMessage();
 				// Ignore - unrecognized files are handled below.
 			}
 		}
 		if (retval == null) {
-			throw(new SpdxCompareException("File "+spdxDocFileName+" is not a recognized RDF/XML or tag/value format"));
+			throw(new SpdxCompareException("File "+spdxDocFileName+" is not a recognized RDF/XML or tag/value format: " + errorDetails));
 		}
 		return retval;
 	}