From 3a04a254ac4b782fbe6b8521e0c77f3311f0d98c Mon Sep 17 00:00:00 2001
From: Min Wei <minwei@Mins-MacBook-Pro.local>
Date: Wed, 10 May 2017 10:19:52 -0700
Subject: [PATCH] Flink state

Summary:
This is to address the issue reported in
    https://github.com/facebook/rocksdb/issues/1988
The fix is simple. A typo.
Closes https://github.com/facebook/rocksdb/pull/2267

Differential Revision: D5037149

Pulled By: siying

fbshipit-source-id: 1bb585c7a753ef77c81c4b92deafbed8e21fe8ff
---
 java/rocksjni/rocksjni.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/rocksjni/rocksjni.cc b/java/rocksjni/rocksjni.cc
index f39a75e6a..05ed30dd0 100644
--- a/java/rocksjni/rocksjni.cc
+++ b/java/rocksjni/rocksjni.cc
@@ -424,7 +424,7 @@ jboolean key_may_exist_helper(JNIEnv* env, rocksdb::DB* db,
   }
 
   rocksdb::Slice key_slice(reinterpret_cast<char*>(key), jkey_len);
-  
+
   std::string value;
   bool value_found = false;
   bool keyMayExist;
@@ -727,7 +727,7 @@ inline void multi_get_helper_release_keys(JNIEnv* env,
  * cf multi get
  *
  * @return byte[][] of values or nullptr if an exception occurs
- */ 
+ */
 jobjectArray multi_get_helper(JNIEnv* env, jobject jdb, rocksdb::DB* db,
     const rocksdb::ReadOptions& rOpt, jobjectArray jkeys,
     jintArray jkey_offs, jintArray jkey_lens,
@@ -1373,7 +1373,7 @@ bool rocksdb_merge_helper(JNIEnv* env, rocksdb::DB* db,
   }
   rocksdb::Slice key_slice(reinterpret_cast<char*>(key), jkey_len);
 
-  jbyte* value = new jbyte[jkey_len];
+  jbyte* value = new jbyte[jval_len];
   env->GetByteArrayRegion(jval, jval_off, jval_len, value);
   if(env->ExceptionCheck()) {
     // exception thrown: ArrayIndexOutOfBoundsException
@@ -2199,4 +2199,3 @@ void Java_org_rocksdb_RocksDB_addFile__JJ_3Ljava_lang_String_2IZ(
     rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
   }
 }
-