Browse Source

HADOOP-8151. Error handling in snappy decompressor throws invalid exceptions. Contributed by Matt Foley.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.0@1334867 13f79535-47bb-0310-9956-ffa450edef68
Matthew Foley 13 năm trước cách đây
mục cha
commit
da439cb785

+ 3 - 0
CHANGES.txt

@@ -71,6 +71,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

+ 1 - 1
src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c

@@ -116,7 +116,7 @@ JNIEXPORT jint JNICALL Java_org_apache_hadoop_io_compress_snappy_SnappyCompresso
 
   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);

+ 3 - 3
src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c

@@ -116,11 +116,11 @@ JNIEXPORT jint JNICALL Java_org_apache_hadoop_io_compress_snappy_SnappyDecompres
 
   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);