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 om...@apache.org on 2011/03/08 05:37:25 UTC
svn commit: r1079123 - in /hadoop/common/branches/yahoo-merge: CHANGES.txt
src/java/org/apache/hadoop/net/SocketInputStream.java
src/test/core/org/apache/hadoop/net/TestSocketIOWithTimeout.java
Author: omalley
Date: Tue Mar 8 04:37:25 2011
New Revision: 1079123
URL: http://svn.apache.org/viewvc?rev=1079123&view=rev
Log:
commit 2ff08f7a0fa76c98c2df78a93efa932d3fc9bc64
Author: Thomas White <to...@apache.org>
Date: Sat Nov 6 03:13:42 2010 +0000
HADOOP-6926. SocketInputStream incorrectly implements read(). Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1031948 13f79535-47bb-0310-9956-ffa450edef68
Modified:
hadoop/common/branches/yahoo-merge/CHANGES.txt
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/net/SocketInputStream.java
hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/net/TestSocketIOWithTimeout.java
Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1079123&r1=1079122&r2=1079123&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Tue Mar 8 04:37:25 2011
@@ -311,6 +311,9 @@ Trunk (unreleased changes)
HADOOP-6758. MapFile.fix does not allow index interval definition.
(Gianmarco De Francisci Morales via tomwhite)
+ HADOOP-6926. SocketInputStream incorrectly implements read().
+ (Todd Lipcon via tomwhite)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/net/SocketInputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/net/SocketInputStream.java?rev=1079123&r1=1079122&r2=1079123&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/net/SocketInputStream.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/net/SocketInputStream.java Tue Mar 8 04:37:25 2011
@@ -119,7 +119,7 @@ public class SocketInputStream extends I
byte[] buf = new byte[1];
int ret = read(buf, 0, 1);
if (ret > 0) {
- return (byte)buf[0];
+ return (int)(buf[0] & 0xff);
}
if (ret != -1) {
// unexpected
Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/net/TestSocketIOWithTimeout.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/net/TestSocketIOWithTimeout.java?rev=1079123&r1=1079122&r2=1079123&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/net/TestSocketIOWithTimeout.java (original)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/net/TestSocketIOWithTimeout.java Tue Mar 8 04:37:25 2011
@@ -101,12 +101,15 @@ public class TestSocketIOWithTimeout ext
byte[] writeBytes = TEST_STRING.getBytes();
byte[] readBytes = new byte[writeBytes.length];
+ byte byteWithHighBit = (byte)0x80;
out.write(writeBytes);
+ out.write(byteWithHighBit);
doIO(null, out);
in.read(readBytes);
assertTrue(Arrays.equals(writeBytes, readBytes));
+ assertEquals(byteWithHighBit & 0xff, in.read());
doIO(in, null);
/*