From 0e34a443a886238f0c7fc00c60906d0899a47523 Mon Sep 17 00:00:00 2001
From: Glen Geng <glengeng@tencent.com>
Date: Thu, 15 Oct 2020 00:23:13 +0800
Subject: [PATCH] HDDS-3995. Fix s3g met NPE exception while write file by
 multiPartUpload

---
 .../org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
index a31986e7cae1..527f774b9a87 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
@@ -598,9 +598,12 @@ private Response createMultipartKey(String bucket, String key, long length,
           IOUtils.copy(body, ozoneOutputStream);
         }
       } finally {
-        IOUtils.closeQuietly(ozoneOutputStream);
+        if (ozoneOutputStream != null) {
+          ozoneOutputStream.close();
+        }
       }
 
+      assert ozoneOutputStream != null;
       OmMultipartCommitUploadPartInfo omMultipartCommitUploadPartInfo =
           ozoneOutputStream.getCommitUploadPartInfo();
       String eTag = omMultipartCommitUploadPartInfo.getPartName();