Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B08DA200BAA for ; Thu, 27 Oct 2016 08:47:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AF320160AF6; Thu, 27 Oct 2016 06:47:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D0B77160AE4 for ; Thu, 27 Oct 2016 08:47:42 +0200 (CEST) Received: (qmail 20580 invoked by uid 500); 27 Oct 2016 06:47:41 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 20558 invoked by uid 99); 27 Oct 2016 06:47:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2016 06:47:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 19936DFC70; Thu, 27 Oct 2016 06:47:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iwasakims@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-13017. Implementations of InputStream.read(buffer, offset, bytes) to exit 0 if bytes==0. Contributed by Steve Loughran. Date: Thu, 27 Oct 2016 06:47:41 +0000 (UTC) archived-at: Thu, 27 Oct 2016 06:47:43 -0000 Repository: hadoop Updated Branches: refs/heads/trunk e29cba61a -> 0bdd263d8 HADOOP-13017. Implementations of InputStream.read(buffer, offset, bytes) to exit 0 if bytes==0. Contributed by Steve Loughran. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0bdd263d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0bdd263d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0bdd263d Branch: refs/heads/trunk Commit: 0bdd263d82a4510f16df49238d57c9f78ac28ae7 Parents: e29cba6 Author: Masatake Iwasaki Authored: Thu Oct 27 15:44:49 2016 +0900 Committer: Masatake Iwasaki Committed: Thu Oct 27 15:46:59 2016 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/HarFileSystem.java | 3 +++ .../main/java/org/apache/hadoop/security/SaslInputStream.java | 5 ++++- .../src/main/java/org/apache/hadoop/security/SaslRpcClient.java | 3 +++ .../src/main/java/org/apache/hadoop/util/LimitInputStream.java | 3 +++ .../main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 3 +++ .../java/org/apache/hadoop/tools/util/ThrottledInputStream.java | 3 +++ .../apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java | 3 +++ .../apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java | 3 +++ 8 files changed, 25 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bdd263d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java index 5f6ae48..ce1cf45 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java @@ -968,6 +968,9 @@ public class HarFileSystem extends FileSystem { @Override public synchronized int read(byte[] b, int offset, int len) throws IOException { + if (len == 0) { + return 0; + } int newlen = len; int ret = -1; if (position + len > end) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bdd263d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java index 7ee4523..a3d66b9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java @@ -246,6 +246,9 @@ public class SaslInputStream extends InputStream implements ReadableByteChannel */ @Override public int read(byte[] b, int off, int len) throws IOException { + if (len == 0) { + return 0; + } if (!useWrap) { return inStream.read(b, off, len); } @@ -378,4 +381,4 @@ public class SaslInputStream extends InputStream implements ReadableByteChannel } return bytesRead; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bdd263d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java index cd942b7..388f1b2 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java @@ -569,6 +569,9 @@ public class SaslRpcClient { @Override public synchronized int read(byte[] buf, int off, int len) throws IOException { + if (len == 0) { + return 0; + } // fill the buffer with the next RPC message if (unwrappedRpcBuffer.remaining() == 0) { readNextRpcPacket(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bdd263d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java index c94a517..bd646e0 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java @@ -74,6 +74,9 @@ public final class LimitInputStream extends FilterInputStream { @Override public int read(byte[] b, int off, int len) throws IOException { + if (len == 0) { + return 0; + } if (left == 0) { return -1; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bdd263d/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java index af43d56..782f113 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java @@ -1832,6 +1832,9 @@ public class WebHdfsFileSystem extends FileSystem if (runnerState == RunnerState.CLOSED) { throw new IOException("Stream closed"); } + if (len == 0) { + return 0; + } // Before the first read, pos and fileLength will be 0 and readBuffer // will all be null. They will be initialized once the first connection http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bdd263d/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java index 7035527..2d2f10c 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ThrottledInputStream.java @@ -84,6 +84,9 @@ public class ThrottledInputStream extends InputStream { /** {@inheritDoc} */ @Override public int read(byte[] b, int off, int len) throws IOException { + if (len == 0) { + return 0; + } throttle(); int readLen = rawStream.read(b, off, len); if (readLen != -1) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bdd263d/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java index c75759e..627792c 100644 --- a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java +++ b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/HttpInputStreamWithRelease.java @@ -187,6 +187,9 @@ public class HttpInputStreamWithRelease extends InputStream { @Override public int read(byte[] b, int off, int len) throws IOException { SwiftUtils.validateReadArgs(b, off, len); + if (len == 0) { + return 0; + } //if the stream is already closed, then report an exception. assumeNotReleased(); //now read in a buffer, reacting differently to different operations http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bdd263d/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java index 3fd3702..23d8c09 100644 --- a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java +++ b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeInputStream.java @@ -161,6 +161,9 @@ class SwiftNativeInputStream extends FSInputStream { public synchronized int read(byte[] b, int off, int len) throws IOException { SwiftUtils.debug(LOG, "read(buffer, %d, %d)", off, len); SwiftUtils.validateReadArgs(b, off, len); + if (len == 0) { + return 0; + } int result = -1; try { verifyOpen(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org