Fix for Kompics Scala Simulator on jdk13. Fixes #14

kompics · Dec 14, 2019 · 97bc28b · 97bc28b
1 parent ffbcfe3
commit 97bc28b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>se.sics.kompics.simulator</groupId>
         <artifactId>kompics-simulator-pom</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>core</artifactId>
     <packaging>jar</packaging>

diff --git a/core/src/main/java/se/sics/kompics/simulator/SimulationScenario.java b/core/src/main/java/se/sics/kompics/simulator/SimulationScenario.java
@@ -105,7 +105,7 @@ protected abstract class StochasticProcess implements Serializable {
         private StochasticProcessStartEvent startEvent;
         private StochasticProcessTerminatedEvent terminateEvent;
         private StochasticProcessEvent stochasticEvent;
-        private Distribution<Long> interArrivalTime = null;
+        private Distribution<Long> interarrivalTime = null;
         protected final LinkedList<OperationGenerator> generators = new LinkedList<>();
         private final String name;
         private boolean started = false;
@@ -119,8 +119,13 @@ protected StochasticProcess() {
             this("Process" + processCount);
         }
 
+        @Deprecated
         protected final void eventInterArrivalTime(Distribution<Long> interArrivalTime) {
-            this.interArrivalTime = interArrivalTime;
+            this.eventInterarrivalTime(interArrivalTime);
+        }
+
+        protected final void eventInterarrivalTime(Distribution<Long> interarrivalTime) {
+            this.interarrivalTime = interarrivalTime;
         }
 
         protected final <E extends KompicsEvent> void raise(int count, Operation<E> op) {
@@ -186,7 +191,7 @@ public final void start() {
             started = true;
             terminateEvent = new StochasticProcessTerminatedEvent(0, new LinkedList<StochasticProcessStartEvent>(),
                     name);
-            stochasticEvent = new StochasticProcessEvent(0, interArrivalTime, terminateEvent, generators, name);
+            stochasticEvent = new StochasticProcessEvent(0, interarrivalTime, terminateEvent, generators, name);
             startEvent = new StochasticProcessStartEvent(startTime, new LinkedList<StochasticProcessStartEvent>(),
                     stochasticEvent, 0, name);
 
@@ -200,7 +205,7 @@ public final void startAt(long time) {
             started = true;
             terminateEvent = new StochasticProcessTerminatedEvent(0, new LinkedList<StochasticProcessStartEvent>(),
                     name);
-            stochasticEvent = new StochasticProcessEvent(0, interArrivalTime, terminateEvent, generators, name);
+            stochasticEvent = new StochasticProcessEvent(0, interarrivalTime, terminateEvent, generators, name);
             startEvent = new StochasticProcessStartEvent(startTime, new LinkedList<StochasticProcessStartEvent>(),
                     stochasticEvent, 0, name);
 
@@ -214,7 +219,7 @@ public final void startAtSameTimeWith(StochasticProcess process) {
             startTime = 0;
             terminateEvent = new StochasticProcessTerminatedEvent(0, new LinkedList<StochasticProcessStartEvent>(),
                     name);
-            stochasticEvent = new StochasticProcessEvent(0, interArrivalTime, terminateEvent, generators, name);
+            stochasticEvent = new StochasticProcessEvent(0, interarrivalTime, terminateEvent, generators, name);
             startEvent = new StochasticProcessStartEvent(startTime, new LinkedList<StochasticProcessStartEvent>(),
                     stochasticEvent, 0, name);
             // we hook this process' start event to the referenced process'
@@ -234,7 +239,7 @@ public final void startAfterStartOf(long delay, StochasticProcess process) {
             startTime = delay;
             terminateEvent = new StochasticProcessTerminatedEvent(0, new LinkedList<StochasticProcessStartEvent>(),
                     name);
-            stochasticEvent = new StochasticProcessEvent(0, interArrivalTime, terminateEvent, generators, name);
+            stochasticEvent = new StochasticProcessEvent(0, interarrivalTime, terminateEvent, generators, name);
             startEvent = new StochasticProcessStartEvent(startTime, new LinkedList<StochasticProcessStartEvent>(),
                     stochasticEvent, 0, name);
             // we hook this process' start event to the referenced process'
@@ -254,7 +259,7 @@ public final void startAfterTerminationOf(long delay, StochasticProcess... proce
             startTime = delay;
             terminateEvent = new StochasticProcessTerminatedEvent(0, new LinkedList<StochasticProcessStartEvent>(),
                     name);
-            stochasticEvent = new StochasticProcessEvent(0, interArrivalTime, terminateEvent, generators, name);
+            stochasticEvent = new StochasticProcessEvent(0, interarrivalTime, terminateEvent, generators, name);
             startEvent = new StochasticProcessStartEvent(startTime, new LinkedList<StochasticProcessStartEvent>(),
                     stochasticEvent, process.length, name);
             // we hook this process' start event to the referenced process'
@@ -338,6 +343,7 @@ public Loader run() {
             });
             cl.delegateLoadingOf("jdk.internal.misc.Unsafe");
             cl.delegateLoadingOf("jdk.internal.reflect.MethodAccessorImpl"); // needed for Mockito#mock
+            cl.delegateLoadingOf("jdk.internal.reflect.ConstructorAccessorImpl");
             cl.delegateLoadingOf("jdk.internal.reflect.SerializationConstructorAccessorImpl");
             cl.addTranslator(cp, t);
             Thread.currentThread().setContextClassLoader(cl);

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>se.sics.kompics.simulator</groupId>
         <artifactId>kompics-simulator-pom</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
     <artifactId>examples</artifactId>
     <packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>se.sics.kompics.simulator</groupId>
     <artifactId>kompics-simulator-pom</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
 
     <name>Kompics Simulator</name>
     <url>http://kompics.sics.se</url>
@@ -35,7 +35,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <kompics.version>1.2.0</kompics.version>
+        <kompics.version>1.2.0-SNAPSHOT</kompics.version>
 
         <junit.jupiter.version>5.4.2</junit.jupiter.version>