Skip to content

Commit a8eca8a

Browse files
committed
fix null bug in DeleteObjectsResult's constructor.
1 parent 516699c commit a8eca8a

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/main/java/com/aliyun/oss/model/DeleteVersionsResult.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ public void setDeleteMarkerVersionId(String deleteMarkerVersionId) {
9292
private final List<DeletedVersion> deletedVersions = new ArrayList<DeletedVersion>();
9393

9494
public DeleteVersionsResult(List<DeletedVersion> deletedVersions) {
95-
this.deletedVersions.addAll(deletedVersions);
95+
if (deletedVersions != null) {
96+
this.deletedVersions.addAll(deletedVersions);
97+
}
9698
}
9799

98100
/**

src/test/java/com/aliyun/oss/common/model/ObjectRelatedTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,11 @@ public void testDeleteVersionsResult() {
389389
assertEquals("markerId", version.getDeleteMarkerVersionId());
390390
assertEquals("key", version.getKey());
391391
assertEquals("versionid", version.getVersionId());
392+
393+
DeleteVersionsResult result = new DeleteVersionsResult(null);
394+
395+
List<DeleteVersionsResult.DeletedVersion> deletedVersions = Arrays.asList();
396+
result = new DeleteVersionsResult(deletedVersions);
392397
}
393398

394399
@Test

0 commit comments

Comments
 (0)