Revision: 18142
http://sourceforge.net/p/gate/code/18142
Author: markagreenwood
Date: 2014-07-03 12:15:29 +0000 (Thu, 03 Jul 2014)
Log Message:
-----------
fixed a nasty bug that lead to the plugin load order being wrong when two
plugins depend on each other
Modified Paths:
--------------
gate/trunk/src/main/gate/creole/CreoleRegisterImpl.java
Modified: gate/trunk/src/main/gate/creole/CreoleRegisterImpl.java
===================================================================
--- gate/trunk/src/main/gate/creole/CreoleRegisterImpl.java 2014-07-03
10:55:40 UTC (rev 18141)
+++ gate/trunk/src/main/gate/creole/CreoleRegisterImpl.java 2014-07-03
12:15:29 UTC (rev 18142)
@@ -281,11 +281,10 @@
}
}
- // add the URL
// if already present do nothing
- if(directories.add(directoryUrl)) {
+ if(!directories.contains(directoryUrl)) {
// add it to the list of known directories
- Gate.addKnownPlugin(directoryUrl);
+
// parse the directory file
try {
parseDirectory(creoleStream, directoryUrl,
@@ -293,11 +292,12 @@
log.info("CREOLE plugin loaded: " + urlName);
}
catch(Throwable e) {
- // it failed: remove it
- directories.remove(directoryUrl);
- //Gate.removeKnownPlugin(directoryUrl);
+ // it failed:
throw (new GateException("couldn't open creole.xml",e));
}
+
+ directories.add(directoryUrl);
+ Gate.addKnownPlugin(directoryUrl);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
