From 7f36b6f561e17fa76c184053d46254faff69142b Mon Sep 17 00:00:00 2001
From: Dico Karssiens <dico.karssiens@gmail.com>
Date: Sun, 30 Sep 2018 15:16:08 +0100
Subject: Small tweaks

---
 .../kotlin/io/dico/parcels2/defaultimpl/ParcelProviderImpl.kt | 11 ++++++-----
 src/main/kotlin/io/dico/parcels2/storage/Hikari.kt            |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelProviderImpl.kt b/src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelProviderImpl.kt
index 48a7fee..74545d6 100644
--- a/src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelProviderImpl.kt
+++ b/src/main/kotlin/io/dico/parcels2/defaultimpl/ParcelProviderImpl.kt
@@ -50,7 +50,7 @@ class ParcelProviderImpl(val plugin: ParcelsPlugin) : ParcelProvider {
             return
         }
 
-        val newlyCreatedWorlds = mutableListOf<ParcelWorld>()
+        //val newlyCreatedWorlds = mutableListOf<ParcelWorld>()
         for ((worldName, worldOptions) in options.worlds.entries) {
             var parcelWorld = _worlds[worldName]
             if (parcelWorld != null) continue
@@ -70,7 +70,7 @@ class ParcelProviderImpl(val plugin: ParcelsPlugin) : ParcelProvider {
                 val time = DateTime.now()
                 plugin.storage.setWorldCreationTime(parcelWorld.id, time)
                 parcelWorld.creationTime = time
-                newlyCreatedWorlds.add(parcelWorld)
+                //newlyCreatedWorlds.add(parcelWorld)
             } else {
                 GlobalScope.launch(context = Dispatchers.Unconfined) {
                     parcelWorld.creationTime = plugin.storage.getWorldCreationTime(parcelWorld.id).await() ?: DateTime.now()
@@ -80,10 +80,10 @@ class ParcelProviderImpl(val plugin: ParcelsPlugin) : ParcelProvider {
             _worlds[worldName] = parcelWorld
         }
 
-        loadStoredData(newlyCreatedWorlds.toSet())
+        loadStoredData()
     }
 
-    private fun loadStoredData(newlyCreatedWorlds: Collection<ParcelWorld> = emptyList()) {
+    private fun loadStoredData() {
         plugin.launch(Dispatchers.Default) {
             val migration = plugin.options.migration
             if (migration.enabled) {
@@ -105,8 +105,9 @@ class ParcelProviderImpl(val plugin: ParcelsPlugin) : ParcelProvider {
                 val channel = plugin.storage.transmitAllParcelData()
                 while (true) {
                     val (id, data) = channel.receiveOrNull() ?: break
+                    if (data == null) continue
                     val parcel = getParcelById(id) ?: continue
-                    data?.let { parcel.copyData(it, callerIsDatabase = true) }
+                    parcel.copyData(data, callerIsDatabase = true)
                 }
             }
 
diff --git a/src/main/kotlin/io/dico/parcels2/storage/Hikari.kt b/src/main/kotlin/io/dico/parcels2/storage/Hikari.kt
index 480d533..d1500d5 100644
--- a/src/main/kotlin/io/dico/parcels2/storage/Hikari.kt
+++ b/src/main/kotlin/io/dico/parcels2/storage/Hikari.kt
@@ -32,7 +32,7 @@ fun getHikariConfig(dialectName: String,
     username = dco.username
     password = dco.password
     connectionTimeout = 15000
-    leakDetectionThreshold = 10000
+    leakDetectionThreshold = 30000
     connectionTestQuery = "SELECT 1"
 
 
-- 
cgit v1.2.3