From 5f9355a7789628204cdee0633acada235a4a0a87 Mon Sep 17 00:00:00 2001 From: Martin Krasser Date: Thu, 21 Nov 2013 12:58:14 +0100 Subject: [PATCH] =per #3739 Fix broken Javadoc generation - caused by field named 'native' in LevelDBJournal --- .../akka/persistence/journal/leveldb/LeveldbJournal.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala index 273abdc946..3d2cb94735 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala @@ -22,7 +22,7 @@ import akka.serialization.SerializationExtension */ private[leveldb] class LeveldbJournal extends SyncWriteJournal with LeveldbIdMapping with LeveldbReplay { val config = context.system.settings.config.getConfig("akka.persistence.journal.leveldb") - val native = config.getBoolean("native") + val nativeLeveldb = config.getBoolean("native") val leveldbOptions = new Options().createIfMissing(true) val leveldbReadOptions = new ReadOptions().verifyChecksums(config.getBoolean("checksum")) @@ -31,7 +31,7 @@ private[leveldb] class LeveldbJournal extends SyncWriteJournal with LeveldbIdMap var leveldb: DB = _ def leveldbFactory = - if (native) org.fusesource.leveldbjni.JniDBFactory.factory + if (nativeLeveldb) org.fusesource.leveldbjni.JniDBFactory.factory else org.iq80.leveldb.impl.Iq80DBFactory.factory // TODO: support migration of processor and channel ids @@ -86,7 +86,7 @@ private[leveldb] class LeveldbJournal extends SyncWriteJournal with LeveldbIdMap } override def preStart() { - leveldb = leveldbFactory.open(leveldbDir, if (native) leveldbOptions else leveldbOptions.compressionType(CompressionType.NONE)) + leveldb = leveldbFactory.open(leveldbDir, if (nativeLeveldb) leveldbOptions else leveldbOptions.compressionType(CompressionType.NONE)) super.preStart() }