From 396ffba1aa108d0f36625d6c788381b77b03b9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Elek?= <elek@apache.org>
Date: Tue, 8 Jan 2019 14:54:38 +0100
Subject: [PATCH] HDDS-968. Fix TestObjectPut failures. Contributed by Bharat
 Viswanadham.

---
 .../org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java     | 2 +-
 1 file changed, 1 insertion(+), 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 5e3807b0ad9..b44893f7a1d 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
@@ -118,7 +118,7 @@ public class ObjectEndpoint extends EndpointBase {
 
     OzoneOutputStream output = null;
 
-    if (!uploadID.equals("")) {
+    if (uploadID != null && !uploadID.equals("")) {
       // If uploadID is specified, it is a request for upload part
       return createMultipartKey(bucketName, keyPath, length,
           partNumber, uploadID, body);