projects
/
rhynodge.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix removal of chains.
[rhynodge.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
reactor
/
loader
/
ChainWatcher.java
diff --git
a/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
b/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
index
4a18a3e
..
3d30f26
100644
(file)
--- 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.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.Map;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import net.pterodactylus.reactor.Reaction;
import java.util.concurrent.TimeUnit;
import net.pterodactylus.reactor.Reaction;
@@
-156,6
+158,7
@@
public class ChainWatcher extends AbstractExecutionThreadService {
logger.debug(String.format("Found %d enabled Chain(s).", enabledChains.size()));
/* check for removed chains. */
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. */
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());
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. */
}
/* check for new chains. */