messed merge

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java

@@ -1432,6 +1432,13 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
                 changedFileMetadataIds.addAll(query.getResultList());
                 logger.fine(
                         "We are indexing a draft version of a dataset that has a released version. We'll be checking file metadatas if they are exact clones of the released versions.");
+            } else if(datasetVersion.isDraft()) {
+                // Add all file metadata ids to changedFileMetadataIds
+                changedFileMetadataIds.addAll(
+                    fileMetadatas.stream()
+                        .map(FileMetadata::getId)
+                        .collect(Collectors.toList())
+                );
             }
 
             AtomicReference<LocalDate> embargoEndDateRef = new AtomicReference<>(null);
@@ -1464,13 +1471,6 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
             } else {
                 if (indexableDataset.getDatasetState().equals(DatasetState.WORKING_COPY)) {
                     datasetPublicationStatuses.add(DRAFT_STRING);
-                } else if(datasetVersion.isDraft()) {
-                    // Add all file metadata ids to changedFileMetadataIds
-                    changedFileMetadataIds.addAll(
-                        fileMetadatas.stream()
-                            .map(FileMetadata::getId)
-                            .collect(Collectors.toList())
-                    );
                 }
             }