From cf7ace886573f387194d158e09497c05a30bd24a Mon Sep 17 00:00:00 2001
From: Naveen <nsomasun@linkedin.com>
Date: Wed, 10 Sep 2014 12:12:31 -0700
Subject: [PATCH] Addressing review comments

---
 java/org/rocksdb/NativeLibraryLoader.java | 19 ++++++++++++-------
 java/org/rocksdb/RocksDB.java             |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/java/org/rocksdb/NativeLibraryLoader.java b/java/org/rocksdb/NativeLibraryLoader.java
index f6b8520f5..880e90acc 100644
--- a/java/org/rocksdb/NativeLibraryLoader.java
+++ b/java/org/rocksdb/NativeLibraryLoader.java
@@ -2,16 +2,16 @@ package org.rocksdb;
 
 import java.io.*;
 
+
+/**
+ * This class is used to load the RocksDB shared library from within the jar.
+ * The shared library is extracted to a temp folder and loaded from there.
+ */
 public class NativeLibraryLoader {
 
   private static String sharedLibraryName = "librocksdbjni.so";
   private static String tempFilePrefix = "librocksdbjni";
   private static String tempFileSuffix = ".so";
-  /**
-   * Private constructor - this class will never be instanced
-   */
-  private NativeLibraryLoader() {
-  }
 
   public static void loadLibraryFromJar()
       throws IOException {
@@ -23,7 +23,7 @@ public class NativeLibraryLoader {
       throw new RuntimeException("File " + temp.getAbsolutePath() + " does not exist.");
     }
 
-    byte[] buffer = new byte[1024];
+    byte[] buffer = new byte[102400];
     int readBytes;
 
     InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(sharedLibraryName);
@@ -31,8 +31,8 @@ public class NativeLibraryLoader {
       throw new RuntimeException(sharedLibraryName + " was not found inside JAR.");
     }
 
-    OutputStream os = new FileOutputStream(temp);
     try {
+      OutputStream os = new FileOutputStream(temp);
       while ((readBytes = is.read(buffer)) != -1) {
         os.write(buffer, 0, readBytes);
       }
@@ -43,4 +43,9 @@ public class NativeLibraryLoader {
 
     System.load(temp.getAbsolutePath());
   }
+  /**
+   * Private constructor to disallow instantiation
+   */
+  private NativeLibraryLoader() {
+  }
 }
diff --git a/java/org/rocksdb/RocksDB.java b/java/org/rocksdb/RocksDB.java
index 132b9ac39..f45a608e2 100644
--- a/java/org/rocksdb/RocksDB.java
+++ b/java/org/rocksdb/RocksDB.java
@@ -26,7 +26,7 @@ public class RocksDB extends RocksObject {
       "snappy", "z", "bzip2", "lz4", "lz4hc"};
 
   static {
-      loadLibrary();
+      RocksDB.loadLibrary();
   }