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 ma...@apache.org on 2012/05/07 05:33:56 UTC
svn commit: r1334868 - in /hadoop/common/branches/branch-1: CHANGES.txt
src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
Author: mattf
Date: Mon May 7 03:33:56 2012
New Revision: 1334868
URL: http://svn.apache.org/viewvc?rev=1334868&view=rev
Log:
HADOOP-8151. Error handling in snappy decompressor throws invalid exceptions. Contributed by Matt Foley.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1334868&r1=1334867&r2=1334868&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May 7 03:33:56 2012
@@ -311,6 +311,9 @@ Release 1.0.3 - unreleased
HADOOP-7381. FindBugs OutOfMemoryError. (Joep Rottinghuis via mattf)
+ HADOOP-8151. Error handling in snappy decompressor throws invalid
+ exceptions. (Matt Foley)
+
Release 1.0.2 - 2012.03.24
NEW FEATURES
Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1.0/CHANGES.txt:r1334867
Modified: hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c?rev=1334868&r1=1334867&r2=1334868&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c (original)
+++ hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c Mon May 7 03:33:56 2012
@@ -116,7 +116,7 @@ JNIEXPORT jint JNICALL Java_org_apache_h
snappy_status ret = dlsym_snappy_compress(uncompressed_bytes, uncompressed_direct_buf_len, compressed_bytes, &compressed_direct_buf_len);
if (ret != SNAPPY_OK){
- THROW(env, "Ljava/lang/InternalError", "Could not compress data. Buffer length is too small.");
+ THROW(env, "java/lang/InternalError", "Could not compress data. Buffer length is too small.");
}
(*env)->SetIntField(env, thisj, SnappyCompressor_uncompressedDirectBufLen, 0);
Modified: hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c?rev=1334868&r1=1334867&r2=1334868&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c (original)
+++ hadoop/common/branches/branch-1/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c Mon May 7 03:33:56 2012
@@ -116,11 +116,11 @@ JNIEXPORT jint JNICALL Java_org_apache_h
snappy_status ret = dlsym_snappy_uncompress(compressed_bytes, compressed_direct_buf_len, uncompressed_bytes, &uncompressed_direct_buf_len);
if (ret == SNAPPY_BUFFER_TOO_SMALL){
- THROW(env, "Ljava/lang/InternalError", "Could not decompress data. Buffer length is too small.");
+ THROW(env, "java/lang/InternalError", "Could not decompress data. Buffer length is too small.");
} else if (ret == SNAPPY_INVALID_INPUT){
- THROW(env, "Ljava/lang/InternalError", "Could not decompress data. Input is invalid.");
+ THROW(env, "java/lang/InternalError", "Could not decompress data. Input is invalid.");
} else if (ret != SNAPPY_OK){
- THROW(env, "Ljava/lang/InternalError", "Could not decompress data.");
+ THROW(env, "java/lang/InternalError", "Could not decompress data.");
}
(*env)->SetIntField(env, thisj, SnappyDecompressor_compressedDirectBufLen, 0);