Parcourir la source

EventRouterThread - nie wysyłał Event.Dispose po dispose'nięciu...

Ranides Atterwim il y a 13 ans
Parent
commit
fa43321b81

+ 1 - 1
pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>net.ranides</groupId>
     <artifactId>assira</artifactId>
-    <version>0.60.4</version>
+    <version>0.60.5</version>
     <packaging>jar</packaging>
 
     <name>assira</name>

+ 1 - 0
src/main/java/net/ranides/assira/events/EventRouterThread.java

@@ -97,6 +97,7 @@ public class EventRouterThread extends EventRouterDispatcher {
                 }
                 if(!interrupted) {
                     dispatchEvent(CoreEvent.shutdown(EventRouterThread.this));
+                    dispatchEvent(CoreEvent.dispose(EventRouterThread.this));
                 }
             }
         };

+ 1 - 1
src/test/java/net/ranides/assira/events/EventJoinTest.java

@@ -82,7 +82,7 @@ public class EventJoinTest {
         main.stop();
 
         assertEquals(SetUtils.asHashSet("global", "io", "write", "read", "exit", "shutdown"), hits.keySet());
-        assertEquals(ArrayUtils.asList(0,3,6,7,10,12), hits.get("global"));
+        assertEquals(ArrayUtils.asList(0,3,6,7,10,12,14), hits.get("global"));
         assertEquals(ArrayUtils.asList(1,4, 8), hits.get("io"));
         assertEquals(ArrayUtils.asList(2), hits.get("write"));
         assertEquals(ArrayUtils.asList(5, 9), hits.get("read"));

+ 2 - 2
src/test/java/net/ranides/assira/events/EventRouterThreadTest.java

@@ -71,7 +71,7 @@ public class EventRouterThreadTest {
         main.stop();
 
         assertEquals(SetUtils.asHashSet("global", "io", "write", "read", "exit", "shutdown"), hits.keySet());
-        assertEquals(ArrayUtils.asList(0,3,6,7,9,11), hits.get("global"));
+        assertEquals(ArrayUtils.asList(0,3,6,7,9,11,13), hits.get("global"));
         assertEquals(ArrayUtils.asList(1,4), hits.get("io"));
         assertEquals(ArrayUtils.asList(2), hits.get("write"));
         assertEquals(ArrayUtils.asList(5), hits.get("read"));
@@ -96,7 +96,7 @@ public class EventRouterThreadTest {
         main.stop();
 
         assertEquals(SetUtils.asHashSet("global", "exit", "shutdown"), hits.keySet());
-        assertEquals(ArrayUtils.asList(0,2,4), hits.get("global"));
+        assertEquals(ArrayUtils.asList(0,2,4,6), hits.get("global"));
         assertEquals(ArrayUtils.asList(1,3), hits.get("exit"));
         assertEquals(ArrayUtils.asList(5), hits.get("shutdown"));