From 374960cd15a2893a124c42975167f8bf6e45e868 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Mon, 5 Oct 2020 12:57:31 +0200
Subject: Address compilation warnings

---
 .../compute/simulator/allocation/ComparableAllocationPolicyLogic.kt   | 2 +-
 .../org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'simulator/opendc-compute')

diff --git a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ComparableAllocationPolicyLogic.kt b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ComparableAllocationPolicyLogic.kt
index 6aff2bab..8defe8b7 100644
--- a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ComparableAllocationPolicyLogic.kt
+++ b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ComparableAllocationPolicyLogic.kt
@@ -44,6 +44,6 @@ public interface ComparableAllocationPolicyLogic : AllocationPolicy.Logic {
                 val fitsCpu = hv.server.flavor.cpuCount >= image.flavor.cpuCount
                 fitsMemory && fitsCpu
             }
-            .minWith(comparator.thenBy { it.server.uid })
+            .minWithOrNull(comparator.thenBy { it.server.uid })
     }
 }
diff --git a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt
index fda863bb..5312f4da 100644
--- a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt
+++ b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt
@@ -46,10 +46,10 @@ public class ReplayAllocationPolicy(private val vmPlacements: Map<String, String
 
             if (machinesInCluster.isEmpty()) {
                 logger.info { "Could not find any machines belonging to cluster $clusterName for image ${image.name}, assigning randomly." }
-                return hypervisors.maxBy { it.availableMemory }
+                return hypervisors.maxByOrNull { it.availableMemory }
             }
 
-            return machinesInCluster.maxBy { it.availableMemory }
+            return machinesInCluster.maxByOrNull { it.availableMemory }
                 ?: throw IllegalStateException("Cloud not find any machine and could not randomly assign")
         }
     }
-- 
cgit v1.2.3