You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2019/01/08 13:55:05 UTC

[hadoop] branch trunk updated: HDDS-968. Fix TestObjectPut failures. Contributed by Bharat Viswanadham.

This is an automated email from the ASF dual-hosted git repository.

elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 396ffba  HDDS-968. Fix TestObjectPut failures. Contributed by Bharat Viswanadham.
396ffba is described below

commit 396ffba1aa108d0f36625d6c788381b77b03b9ba
Author: Márton Elek <el...@apache.org>
AuthorDate: Tue Jan 8 14:54:38 2019 +0100

    HDDS-968. Fix TestObjectPut failures. Contributed by Bharat Viswanadham.
---
 .../main/java/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 5e3807b..b44893f 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);


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org