summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-04-03 23:16:21 +0200
committerAndrew Branson <andrew.branson@cern.ch>2013-04-03 23:16:21 +0200
commit641678b583ab04f14051d94e7ce8caf260e577fa (patch)
treefe2ac8ac13514f0a435e94b46f8d8c2182daf2bd /src
parent92ffe23717b8d0d40ddd9c50d4cac0371e84c1f6 (diff)
Fix bug in shuffling
Added extra debug for shuffling
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/c2kernel/process/module/ModuleManager.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java
index 0e96486..b4c990f 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleManager.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java
@@ -77,21 +77,24 @@ public class ModuleManager {
boolean depClean = false;
int skipped = 0;
Module thisMod = modules.get(i);
+ Logger.msg(5, "Checking dependencies of module "+thisMod.getName());
while (!depClean) {
ArrayList<String> deps = thisMod.getDependencies();
depClean = true;
for (String dep : deps) {
+ Logger.msg(6, thisMod.getName()+" depends on "+dep);
if (!loadedModules.contains(dep)) {
Logger.error("UNMET MODULE DEPENDENCY: "+thisMod.getName()+" requires "+dep);
allDepsPresent = true;
}
else if (!prevModules.contains(dep)) {
- Logger.msg("ModuleManager: Shuffling "+thisMod.getName()+" to the end to fulfil dependency on "+dep);
+ Logger.msg(1, "ModuleManager: Shuffling "+thisMod.getName()+" to the end to fulfil dependency on "+dep);
modules.remove(i);
modules.add(thisMod);
thisMod = modules.get(i);
skipped++;
depClean = false;
+ break;
}
}
if (skipped > modules.size()-i) {