Merge pull request #2 from jembi/objectrefs-fix

Fixes objectref handling in GetSubmissionSetAndContents

iheos/src/main/java/gov/nist/registry/ws/sq/ebxmlrr21/EbXML21GetSubmissionSetAndContents.java

@@ -98,17 +98,20 @@ public Metadata runImplementation() throws XdsException, LoggerException,
 		metadata.rmDuplicates();
 
 		// some document may have been filtered out, remove the unnecessary Associations
+		// first collect all the content ids that we want to keep...
 		List<String> content_ids = new ArrayList<String>();
 		content_ids.addAll(metadata.getSubmissionSetIds());
 		content_ids.addAll(metadata.getExtrinsicObjectIds());
 		content_ids.addAll(metadata.getFolderIds());
+		content_ids.addAll(metadata.getObjectRefIds());
 
 		// add in Associations that link the above parts
 		content_ids.addAll(metadata.getIds(metadata.getAssociationsInclusive(content_ids)));
 
 		// Assocs can link to Assocs to so repeat
 		content_ids.addAll(metadata.getIds(metadata.getAssociationsInclusive(content_ids)));
 
+		// ... Now, filter out all metadata that isn't in this id list
 		metadata.filter(content_ids);
 
 		return metadata;