X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Freactor%2Floader%2FChainWatcher.java;h=3d30f2615edfc140405d9237064e891134b05cdd;hb=ecdd6bf87e8e2bddb897e97a6089deefef04a91b;hp=9daf262b64d9371446c417a8854ca35a435476b7;hpb=0eb18e62d2ec792392e55b1d09226c178c2b8ae1;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java b/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
index 9daf262..3d30f26 100644
--- a/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
+++ b/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
@@ -21,8 +21,10 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import net.pterodactylus.reactor.Reaction;
@@ -142,7 +144,7 @@ public class ChainWatcher extends AbstractExecutionThreadService {
 					logger.debug(String.format("  Parameter: %s=%s", parameter.name(), parameter.value()));
 				}
 
-				chains.put(configurationFile.getName(), chain);
+				chains.put(getReactionName(configurationFile.getName()), chain);
 			}
 
 			/* filter enabled chains. */
@@ -156,6 +158,7 @@ public class ChainWatcher extends AbstractExecutionThreadService {
 			logger.debug(String.format("Found %d enabled Chain(s).", enabledChains.size()));
 
 			/* check for removed chains. */
+			Set<String> chainsToRemove = new HashSet<String>();
 			for (Entry<String, Chain> loadedChain : loadedChains.entrySet()) {
 
 				/* skip chains that still exist. */
@@ -165,7 +168,12 @@ public class ChainWatcher extends AbstractExecutionThreadService {
 
 				logger.info(String.format("Removing Chain: %s", loadedChain.getKey()));
 				engine.removeReaction(loadedChain.getKey());
-				loadedChains.remove(loadedChain.getKey());
+				chainsToRemove.add(loadedChain.getKey());
+			}
+
+			/* remove removed chains from loaded chains. */
+			for (String reactionName : chainsToRemove) {
+				loadedChains.remove(reactionName);
 			}
 
 			/* check for new chains. */
@@ -212,4 +220,15 @@ public class ChainWatcher extends AbstractExecutionThreadService {
 		return null;
 	}
 
+	/**
+	 * Extracts the name of the reaction from the given filename.
+	 *
+	 * @param filename
+	 *            The filename to extract the reaction name from
+	 * @return The name of the reaction
+	 */
+	private static String getReactionName(String filename) {
+		return (filename.lastIndexOf(".") > -1) ? filename.substring(0, filename.lastIndexOf(".")) : filename;
+	}
+
 }