[Unicore-cvs-commits] SF.net SVN: unicore:[14382] wsrflite/trunk/core/src/main/java/de/fzj/ unicore/wsrflite/Kernel.java

[<bsc...@us...>]

Revision: 14382
          http://unicore.svn.sourceforge.net/unicore/?rev=14382&view=rev
Author:   bschuller
Date:     2012-09-24 12:17:46 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
change order of startup task execution: system tasks (e.g. WSRFStartup) must be before user-defined ones

Modified Paths:
--------------
    wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java

Modified: wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java
===================================================================
--- wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java	2012-09-24 11:33:01 UTC (rev 14381)
+++ wsrflite/trunk/core/src/main/java/de/fzj/unicore/wsrflite/Kernel.java	2012-09-24 12:17:46 UTC (rev 14382)
@@ -614,6 +614,10 @@
 		isShutdown=false;
 		jetty.start();
 		
+		//run new style StartupTasks
+		ServiceLoader<StartupTask> sl = ServiceLoader.load(StartupTask.class);
+		new StartupTasksRunner().runStartupTasks(this, sl);
+
 		//run "home" startup tasks
 		for(Service s: services.values()){
 			Home h=s.getHome();
@@ -621,6 +625,7 @@
 				h.run();
 			}
 		}
+
 		//run user defined init tasks after basic setup is complete
 		if(startupTasks!=null){
 			for (Runnable r : startupTasks) {
@@ -628,9 +633,6 @@
 				r.run();
 			}
 		}
-		//run new style StartupTasks
-		ServiceLoader<StartupTask> sl = ServiceLoader.load(StartupTask.class);
-		new StartupTasksRunner().runStartupTasks(this, sl);
 
 		startLogConfigWatcher();
 		addShutDownHook();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.