hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1079117 - in /hadoop/common/branches/yahoo-merge: CHANGES.txt src/java/org/apache/hadoop/fs/s3/S3InputStream.java
Date Tue, 08 Mar 2011 04:36:56 GMT
Author: omalley
Date: Tue Mar  8 04:36:55 2011
New Revision: 1079117

URL: http://svn.apache.org/viewvc?rev=1079117&view=rev
Log:
commit a101cdc3e6df09b006cc10d5681a7c810eba533b
Author: Thomas White <tomwhite@apache.org>
Date:   Mon Nov 1 22:25:54 2010 +0000

    HADOOP-6975.  Integer overflow in S3InputStream for blocks > 2GB.  Contributed by Patrick
Kling.
    
    git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1029867 13f79535-47bb-0310-9956-ffa450edef68

Modified:
    hadoop/common/branches/yahoo-merge/CHANGES.txt
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/s3/S3InputStream.java

Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1079117&r1=1079116&r2=1079117&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Tue Mar  8 04:36:55 2011
@@ -297,6 +297,9 @@ Trunk (unreleased changes)
     HADOOP-7011.  Fix KerberosName.main() to not throw an NPE.
     (Aaron T. Myers via tomwhite)
 
+    HADOOP-6975.  Integer overflow in S3InputStream for blocks > 2GB.
+    (Patrick Kling via tomwhite)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/s3/S3InputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/s3/S3InputStream.java?rev=1079117&r1=1079116&r2=1079117&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/s3/S3InputStream.java
(original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/s3/S3InputStream.java
Tue Mar  8 04:36:55 2011
@@ -128,7 +128,7 @@ class S3InputStream extends FSInputStrea
       if (pos > blockEnd) {
         blockSeekTo(pos);
       }
-      int realLen = Math.min(len, (int) (blockEnd - pos + 1));
+      int realLen = (int) Math.min((long) len, (blockEnd - pos + 1L));
       int result = blockStream.read(buf, off, realLen);
       if (result >= 0) {
         pos += result;



Mime
View raw message