Skip to content

Commit c31c90f

Browse files
committed
address comments
1 parent 4d3884d commit c31c90f

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

src/main/java/edu/harvard/iq/dataverse/DataFile.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -304,15 +304,8 @@ public void setDeleted(Boolean deleted) {
304304
this.deleted = deleted;
305305
}
306306

307-
@Transient
308-
private boolean unpublished;
309-
310307
public boolean getUnpublished() {
311-
return unpublished;
312-
}
313-
314-
public void setUnpublished(boolean unpublished) {
315-
this.unpublished = unpublished;
308+
return !isReleased();
316309
}
317310

318311
/*
@@ -607,14 +600,11 @@ public FileMetadata getLatestFileMetadata() {
607600
FileMetadata resultFileMetadata = null;
608601

609602
if (fileMetadatas.size() == 1) {
610-
setUnpublished(fileMetadatas.get(0).getDatasetVersion() == null || fileMetadatas.get(0).getDatasetVersion().getVersionState().equals(VersionState.DRAFT));
611603
return fileMetadatas.get(0);
612-
} else {
613-
setUnpublished(false); // Since only one can be in Draft assume there is a published version
614604
}
615605

616606
for (FileMetadata fileMetadata : fileMetadatas) {
617-
if (fileMetadata.getDatasetVersion().getVersionState().equals(VersionState.DRAFT)) {
607+
if (fileMetadata.getDatasetVersion() != null && VersionState.DRAFT.equals(fileMetadata.getDatasetVersion().getVersionState())) {
618608
return fileMetadata;
619609
}
620610
resultFileMetadata = getTheNewerFileMetadata(resultFileMetadata, fileMetadata);

0 commit comments

Comments
 (0)