Fix potential NPE in BaseFileCopier

rundeck · Jun 10, 2011 · c40f68f · c40f68f
1 parent 65ca621
commit c40f68f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/java/com/dtolabs/rundeck/core/execution/impl/common/BaseFileCopier.java b/core/src/java/com/dtolabs/rundeck/core/execution/impl/common/BaseFileCopier.java
@@ -104,7 +104,7 @@ public static File writeScriptTempFile(final ExecutionContext context, final Fil
      */
     public static String appendRemoteFileExtensionForNode(final INodeEntry node, final String filepath) {
         String result = filepath;
-        if ("windows".equalsIgnoreCase(node.getOsFamily().trim())) {
+        if (null != node.getOsFamily() && "windows".equalsIgnoreCase(node.getOsFamily().trim())) {
             result += (filepath.endsWith(".bat") ? "" : ".bat");
         } else {
             result += (filepath.endsWith(".sh") ? "" : ".sh");
@@ -126,7 +126,7 @@ public static String getRemoteDirForNode(final INodeEntry node) {
             return node.getAttributes().get(FILE_COPY_DESTINATION_DIR);
         }
         String remotedir = "/tmp/";
-        if ("windows".equalsIgnoreCase(node.getOsFamily().trim())) {
+        if (null != node.getOsFamily() && "windows".equalsIgnoreCase(node.getOsFamily().trim())) {
             remotedir = "C:/WINDOWS/TEMP/";
         }
         return remotedir;