From fc2134fab757e5c880a8be1b4e45933886bec7e9 Mon Sep 17 00:00:00 2001 From: Lionel Schwarz Date: Tue, 25 Nov 2014 14:25:40 +0100 Subject: [PATCH] Do nothing on Windows (the Globus way) instead of exception due to 'ls' and 'chmod' not found --- .../org/italiangrid/voms/util/FilePermissionHelper.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/italiangrid/voms/util/FilePermissionHelper.java b/src/main/java/org/italiangrid/voms/util/FilePermissionHelper.java index 0cecd4e0..9112b165 100644 --- a/src/main/java/org/italiangrid/voms/util/FilePermissionHelper.java +++ b/src/main/java/org/italiangrid/voms/util/FilePermissionHelper.java @@ -33,6 +33,7 @@ */ public class FilePermissionHelper { + private static final boolean s_isWindows = System.getProperty("os.name").toLowerCase().startsWith("windows"); public static enum PosixFilePermission { USER_RO("400", "-r--------"), @@ -167,6 +168,9 @@ public static void matchesFilePermissions(String filename, filenameSanityChecks(filename); + if (s_isWindows) + return; + if (p == null) throw new NullPointerException("null permission passed as argument"); @@ -249,6 +253,9 @@ public static void setPrivateKeyPermissions(String filename) { public static void setFilePermissions(String filename, PosixFilePermission perm) { + if (s_isWindows) + return; + String cmd = String.format(CHMOD_CMD_TEMPLATE, perm.chmodForm(), filename); ProcessBuilder pb = new ProcessBuilder(cmd.split(" "));