From e0ebea6cc21de82240be63dd2a2f7a4f5cc68cfc Mon Sep 17 00:00:00 2001
From: Ankit Gupta <aigupta@linkedin.com>
Date: Sun, 22 Jun 2014 13:27:22 -0700
Subject: [PATCH] Add doc and end of line

---
 Makefile                                           | 2 +-
 java/Makefile                                      | 1 +
 java/org/rocksdb/RocksDB.java                      | 5 +----
 java/org/rocksdb/StatisticsCollector.java          | 4 ++--
 java/org/rocksdb/StatisticsCollectorCallback.java  | 2 +-
 java/org/rocksdb/test/StatisticsCollectorTest.java | 2 +-
 java/org/rocksdb/test/StatsCallbackMock.java       | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index c31e1e8ca..ca419f08b 100644
--- a/Makefile
+++ b/Makefile
@@ -439,7 +439,7 @@ ROCKSDBJNILIB = ./java/librocksdbjni.jnilib
 JAVA_INCLUDE = -I/System/Library/Frameworks/JavaVM.framework/Headers/
 endif
 
-rocksdbjava: clean
+rocksdbjava:
 	OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j32
 	cd java;$(MAKE) java;
 	rm -f $(ROCKSDBJNILIB)
diff --git a/java/Makefile b/java/Makefile
index 36452d324..7a9c64732 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -29,6 +29,7 @@ test: java
 	java -ea -Djava.library.path=.:../ -cp "$(ROCKSDB_JAR):.:./*" org.rocksdb.test.BackupableDBTest
 	java -ea -Djava.library.path=.:../ -cp "$(ROCKSDB_JAR):.:./*" org.rocksdb.test.OptionsTest
 	java -ea -Djava.library.path=.:../ -cp "$(ROCKSDB_JAR):.:./*" org.rocksdb.test.ReadOptionsTest
+	java -ea -Djava.library.path=.:../ -cp "$(ROCKSDB_JAR):.:./*" org.rocksdb.test.StatisticsCollectorTest
 
 db_bench: java
 	javac org/rocksdb/benchmark/*.java
diff --git a/java/org/rocksdb/RocksDB.java b/java/org/rocksdb/RocksDB.java
index 1b758e1a2..cec73ed49 100644
--- a/java/org/rocksdb/RocksDB.java
+++ b/java/org/rocksdb/RocksDB.java
@@ -93,10 +93,7 @@ public class RocksDB extends RocksObject {
     // This allows to use the rocksjni default Options instead of
     // the c++ one.
     Options options = new Options();
-    db.open(options.nativeHandle_, options.cacheSize_, path);
-    db.transferCppRawPointersOwnershipFrom(options);
-    options.dispose();
-    return db;
+    return open(options, path);
   }
 
   /**
diff --git a/java/org/rocksdb/StatisticsCollector.java b/java/org/rocksdb/StatisticsCollector.java
index b771ce15d..e642e4f0b 100644
--- a/java/org/rocksdb/StatisticsCollector.java
+++ b/java/org/rocksdb/StatisticsCollector.java
@@ -57,7 +57,7 @@ public class StatisticsCollector {
       public void run() {
         while (_isRunning) {
           try {
-              // Collect ticker data
+            // Collect ticker data
             for(TickerType ticker : TickerType.values()) {
               long tickerValue = _statistics.getTickerCount(ticker);
               _statsCallback.tickerCallback(ticker, tickerValue);
@@ -83,4 +83,4 @@ public class StatisticsCollector {
       }
     };
   }
-}
\ No newline at end of file
+}
diff --git a/java/org/rocksdb/StatisticsCollectorCallback.java b/java/org/rocksdb/StatisticsCollectorCallback.java
index 37f53684e..95671915b 100644
--- a/java/org/rocksdb/StatisticsCollectorCallback.java
+++ b/java/org/rocksdb/StatisticsCollectorCallback.java
@@ -24,4 +24,4 @@ public interface StatisticsCollectorCallback {
    * @param histData Histogram data.
   */
   void histogramCallback(HistogramType histType, HistogramData histData);
-}
\ No newline at end of file
+}
diff --git a/java/org/rocksdb/test/StatisticsCollectorTest.java b/java/org/rocksdb/test/StatisticsCollectorTest.java
index e706528b1..ed8993840 100644
--- a/java/org/rocksdb/test/StatisticsCollectorTest.java
+++ b/java/org/rocksdb/test/StatisticsCollectorTest.java
@@ -36,4 +36,4 @@ public class StatisticsCollectorTest {
     
     System.out.println("Stats collector test passed.!");
   }
-}
\ No newline at end of file
+}
diff --git a/java/org/rocksdb/test/StatsCallbackMock.java b/java/org/rocksdb/test/StatsCallbackMock.java
index 2cb70f799..355b7368f 100644
--- a/java/org/rocksdb/test/StatsCallbackMock.java
+++ b/java/org/rocksdb/test/StatsCallbackMock.java
@@ -19,4 +19,4 @@ public class StatsCallbackMock implements StatisticsCollectorCallback {
       HistogramData histData) {
     histCallbackCount++;
   }
-}
\ No newline at end of file
+}