Merge pull request XRPLF#329 from fyrz/master

resolution for java build problem introduced by 5ec53f3...
JoelKatz · Oct 2, 2014 · 25888ae · 25888ae
2 parents 89833e5 + b3343fd
commit 25888ae
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/java/rocksjni/write_batch.cc b/java/rocksjni/write_batch.cc
@@ -206,7 +206,8 @@ jbyteArray Java_org_rocksdb_WriteBatchTest_getContents(
   options.memtable_factory = factory;
   rocksdb::MemTable* mem = new rocksdb::MemTable(
       cmp, rocksdb::ImmutableCFOptions(options),
-      rocksdb::MemTableOptions(rocksdb::MutableCFOptions(options), options));
+      rocksdb::MemTableOptions(rocksdb::MutableCFOptions(options,
+          rocksdb::ImmutableCFOptions(options)), options));
   mem->Ref();
   std::string state;
   rocksdb::ColumnFamilyMemTablesDefault cf_mems_default(mem, &options);