Add check if node is offline - Try to fix JENKINS-17566

jenkinsci · May 3, 2013 · 2a270bb · 2a270bb
1 parent a27ae73
commit 2a270bb
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 25 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTriggerExecutor.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/ScriptTriggerExecutor.java
@@ -99,6 +99,9 @@ public Boolean call() throws ScriptTriggerException {
             final String[] cmd = batchRunner.buildCommandLine(tmpFile);
 
             final FilePath rootPath = executingNode.getRootPath();
+            if (rootPath == null) {
+                throw new ScriptTriggerException("The node is offline.");
+            }
             return rootPath.act(new FilePath.FileCallable<Integer>() {
                 public Integer invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
                     try {

diff --git a/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java b/src/main/java/org/jenkinsci/plugins/scripttrigger/groovy/GroovyScriptTrigger.java
@@ -87,31 +87,34 @@ protected Action[] getScheduledActions(Node pollingNode, final XTriggerLog log)
 
         if (propertiesFilePath != null) {
             try {
-                return pollingNode.getRootPath()
-                        .act(new FilePath.FileCallable<Action[]>() {
-
-                            public Action[] invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
-                                File propFile = new File(propertiesFilePath);
-                                if (!propFile.exists()) {
-                                    log.info(String.format("Can't load the properties file '%s'. It doesn't exist.", f.getPath()));
-                                    return null;
-                                }
-
-                                Properties properties = new Properties();
-                                FileInputStream fis = new FileInputStream(propFile);
-                                properties.load(fis);
-                                fis.close();
-
-                                List<ParameterValue> parameterValueList = new ArrayList<ParameterValue>();
-                                for (Map.Entry property : properties.entrySet()) {
-                                    ParameterValue parameterValue = new StringParameterValue(
-                                            String.valueOf(property.getKey()),
-                                            String.valueOf(property.getValue()));
-                                    parameterValueList.add(parameterValue);
-                                }
-                                return new Action[]{new ParametersAction(parameterValueList)};
-                            }
-                        });
+                FilePath rootPath = pollingNode.getRootPath();
+                if (rootPath == null) {
+                    throw new ScriptTriggerException("The node is offline.");
+                }
+                return rootPath.act(new FilePath.FileCallable<Action[]>() {
+
+                    public Action[] invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
+                        File propFile = new File(propertiesFilePath);
+                        if (!propFile.exists()) {
+                            log.info(String.format("Can't load the properties file '%s'. It doesn't exist.", f.getPath()));
+                            return null;
+                        }
+
+                        Properties properties = new Properties();
+                        FileInputStream fis = new FileInputStream(propFile);
+                        properties.load(fis);
+                        fis.close();
+
+                        List<ParameterValue> parameterValueList = new ArrayList<ParameterValue>();
+                        for (Map.Entry property : properties.entrySet()) {
+                            ParameterValue parameterValue = new StringParameterValue(
+                                    String.valueOf(property.getKey()),
+                                    String.valueOf(property.getValue()));
+                            parameterValueList.add(parameterValue);
+                        }
+                        return new Action[]{new ParametersAction(parameterValueList)};
+                    }
+                });
             } catch (IOException ioe) {
                 throw new ScriptTriggerException(ioe);
             } catch (InterruptedException ie) {