dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clarified init parameters

Browse Source
This commit is contained in:
nathan 2016-03-18 02:33:59 +01:00
parent 2c6212b9e3
commit 1215fce459
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dorkbox/network/connection/PropertyStore.java
View File

@ -51,7 +51,7 @@ class PropertyStore extends SettingsStore {
*/ */
@Override @Override
public public
void init(final SerializationManager serializationManager, final Storage storage) throws IOException { void init(final SerializationManager serializationManager, final Storage ignored) throws IOException {
// make sure our custom types are registered // make sure our custom types are registered
// only register if not ALREADY initialized, since we can initialize in the server and in the client. This creates problems if // only register if not ALREADY initialized, since we can initialize in the server and in the client. This creates problems if
// running inside the same JVM (we don't permit it) // running inside the same JVM (we don't permit it)
@ -61,17 +61,11 @@ class PropertyStore extends SettingsStore {
serializationManager.register(DB_Server.class); serializationManager.register(DB_Server.class);
} }
if (storage == null) { this.storage = Store.Memory()
this.storage = Store.Memory() .make();
.make();
}
else {
this.storage = storage;
}
servers = this.storage.getAndPut(DatabaseStorage.SERVERS, new HashMap<ByteArrayWrapper, DB_Server>(16)); servers = this.storage.getAndPut(DatabaseStorage.SERVERS, new HashMap<ByteArrayWrapper, DB_Server>(16));
//use map to keep track of recordId, so we can get record info during restarts.
DB_Server localServer = servers.get(DB_Server.IP_LOCALHOST); DB_Server localServer = servers.get(DB_Server.IP_LOCALHOST);
if (localServer == null) { if (localServer == null) {
localServer = new DB_Server(); localServer = new DB_Server();