From 6ee2c35e20de6344a131bad9316cc97ef2ce231e Mon Sep 17 00:00:00 2001
From: Lars Ivar Hatledal <laht@hials.no>
Date: Thu, 18 Jul 2019 11:01:34 +0200
Subject: [PATCH] Fix status not updated when calling setup on FMI 1.0 and
 cleanup

---
 .../ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt | 8 ++++----
 .../no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt  | 8 ++++----
 .../ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt
index 77e07e5d..b712f348 100644
--- a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt
+++ b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/AbstractModelInstance.kt
@@ -126,10 +126,6 @@ abstract class AbstractModelInstance<out E : CommonModelDescription, out T : Fmi
         return wrapper.write(vr, value)
     }
 
-    private companion object {
-        private val LOG: Logger = LoggerFactory.getLogger(AbstractModelInstance::class.java)
-    }
-
     override fun getFMUstate(): FmuState {
         throw IllegalStateException("Feature not available for FMI 1.0")
     }
@@ -154,4 +150,8 @@ abstract class AbstractModelInstance<out E : CommonModelDescription, out T : Fmi
         throw IllegalStateException("Feature not available for FMI 1.0")
     }
 
+    private companion object {
+        private val LOG: Logger = LoggerFactory.getLogger(AbstractModelInstance::class.java)
+    }
+
 }
diff --git a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt
index b4abbdf6..1fdd1aa3 100644
--- a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt
+++ b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/CoSimulationSlave.kt
@@ -63,13 +63,13 @@ class CoSimulationSlave internal constructor(
 
         simulationTime = start
 
-        return true
+        return true.also {
+            wrapper.lastStatus = FmiStatus.OK
+        }
     }
 
     override fun exitInitializationMode(): Boolean {
-        return (wrapper.initializeSlave(startTime, stopTime).isOK()).also {
-            wrapper.lastStatus = FmiStatus.OK
-        }
+        return wrapper.initializeSlave(startTime, stopTime).isOK()
     }
 
     override fun doStep(stepSize: Double): Boolean {
diff --git a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt
index 70a7bd1a..dce811d2 100644
--- a/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt
+++ b/fmi-import/src/main/kotlin/no/ntnu/ihb/fmi4j/importer/fmi1/ModelExchangeInstance.kt
@@ -63,15 +63,15 @@ open class ModelExchangeInstance internal constructor(
 
         relativeTolerance = tolerance
 
-        return true
+        return true.also {
+            wrapper.lastStatus = FmiStatus.OK
+        }
 
     }
 
     override fun exitInitializationMode(): Boolean {
         val toleranceControlled = relativeTolerance > 0
-        return (wrapper.initialize(toleranceControlled, relativeTolerance).isOK()).also {
-            wrapper.lastStatus = FmiStatus.OK
-        }
+        return wrapper.initialize(toleranceControlled, relativeTolerance).isOK()
     }
 
     override fun reset(): Boolean {