From 91ccc8ebefc48b5f4fcc0e0a7a220fd808dc52d4 Mon Sep 17 00:00:00 2001
From: fyrz <fyrgoss@gmail.com>
Date: Tue, 18 Nov 2014 21:45:12 +0100
Subject: [PATCH] [RocksJava] Integrated changes in D29025

Addressed review comments.
---
 java/org/rocksdb/ColumnFamilyOptions.java | 22 +++++++++++-----------
 java/org/rocksdb/DBOptions.java           | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/java/org/rocksdb/ColumnFamilyOptions.java b/java/org/rocksdb/ColumnFamilyOptions.java
index 7fa4545b5..3d3b236a2 100644
--- a/java/org/rocksdb/ColumnFamilyOptions.java
+++ b/java/org/rocksdb/ColumnFamilyOptions.java
@@ -31,17 +31,6 @@ public class ColumnFamilyOptions extends RocksObject
     newColumnFamilyOptions();
   }
 
-  /**
-   * <p>Private constructor to be used by
-   * {@link #getColumnFamilyOptionsFromProps(java.util.Properties)}</p>
-   *
-   * @param handle native handle to ColumnFamilyOptions instance.
-   */
-  private ColumnFamilyOptions(long handle) {
-    super();
-    nativeHandle_ = handle;
-  }
-
   /**
    * <p>Method to get a options instance by using pre-configured
    * property values. If one or many values are undefined in
@@ -576,6 +565,17 @@ public class ColumnFamilyOptions extends RocksObject
     disposeInternal(nativeHandle_);
   }
 
+  /**
+   * <p>Private constructor to be used by
+   * {@link #getColumnFamilyOptionsFromProps(java.util.Properties)}</p>
+   *
+   * @param handle native handle to ColumnFamilyOptions instance.
+   */
+  private ColumnFamilyOptions(long handle) {
+    super();
+    nativeHandle_ = handle;
+  }
+
   private static native long getColumnFamilyOptionsFromProps(
       String optString);
 
diff --git a/java/org/rocksdb/DBOptions.java b/java/org/rocksdb/DBOptions.java
index 45113c0f2..600369dec 100644
--- a/java/org/rocksdb/DBOptions.java
+++ b/java/org/rocksdb/DBOptions.java
@@ -31,17 +31,6 @@ public class DBOptions extends RocksObject implements DBOptionsInterface {
     newDBOptions();
   }
 
-  /**
-   * <p>Private constructor to be used by
-   * {@link #getDBOptionsFromProps(java.util.Properties)}</p>
-   *
-   * @param handle native handle to DBOptions instance.
-   */
-  private DBOptions(long handle) {
-    super();
-    nativeHandle_ = handle;
-  }
-
   /**
    * <p>Method to get a options instance by using pre-configured
    * property values. If one or many values are undefined in
@@ -541,6 +530,17 @@ public class DBOptions extends RocksObject implements DBOptionsInterface {
 
   static final int DEFAULT_NUM_SHARD_BITS = -1;
 
+  /**
+   * <p>Private constructor to be used by
+   * {@link #getDBOptionsFromProps(java.util.Properties)}</p>
+   *
+   * @param handle native handle to DBOptions instance.
+   */
+  private DBOptions(long handle) {
+    super();
+    nativeHandle_ = handle;
+  }
+
   private static native long getDBOptionsFromProps(
       String optString);