gCubeSystem
/
smart-executor
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged fixes form branch. Upgraded version to 1.6 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@144713 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2017-03-07 10:02:51 +00:00
parent 4466af6ef5
commit eadc152dd8
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -10,7 +10,7 @@
<groupId>org.gcube.vremanagement</groupId> <groupId>org.gcube.vremanagement</groupId>
<artifactId>smart-executor</artifactId> <artifactId>smart-executor</artifactId>
<version>1.5.0-SNAPSHOT</version> <version>1.6.0-SNAPSHOT</version>
<name>SmartExecutor</name> <name>SmartExecutor</name>
<description>Smart Executor Service</description> <description>Smart Executor Service</description>
<packaging>war</packaging> <packaging>war</packaging>
@ -146,7 +146,7 @@
<dependency> <dependency>
<groupId>com.sun.xml.ws</groupId> <groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId> <artifactId>jaxws-rt</artifactId>
<version>2.1.7</version> <version>2.2.10</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

2
src/main/java/org/gcube/vremanagement/executor/scheduler/SmartExecutorTask.java
View File

@ -122,6 +122,7 @@ public class SmartExecutorTask implements InterruptableJob {
} }
Map<String, Map<String, String>> pluginStateNotificationWithInputs = launchParameter.getPluginStateNotifications(); Map<String, Map<String, String>> pluginStateNotificationWithInputs = launchParameter.getPluginStateNotifications();
if(pluginStateNotificationWithInputs!=null){
for(String pluginStateNotificationsClassName : pluginStateNotificationWithInputs.keySet()){ for(String pluginStateNotificationsClassName : pluginStateNotificationWithInputs.keySet()){
if(pluginStateNotificationsClassName.compareTo(SmartExecutorPersistenceConnector.class.getName())==0) { if(pluginStateNotificationsClassName.compareTo(SmartExecutorPersistenceConnector.class.getName())==0) {
logger.warn("{} is for internal use only. It will be skypped", pluginStateNotificationsClassName); logger.warn("{} is for internal use only. It will be skypped", pluginStateNotificationsClassName);
@ -145,6 +146,7 @@ public class SmartExecutorTask implements InterruptableJob {
} }
} }
}
initialized = true; initialized = true;
} }