From 04a33280949db1032edb0480d82404fac7849eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n=20Blanco?= Date: Mon, 24 Jun 2024 16:24:57 +0200 Subject: [PATCH] Ensure include FilePath in Windows has normalized separators --- .../com/google/jenkins/plugins/storage/util/StorageUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/jenkins/plugins/storage/util/StorageUtil.java b/src/main/java/com/google/jenkins/plugins/storage/util/StorageUtil.java index 7dd7e00d..fc8d1e0c 100644 --- a/src/main/java/com/google/jenkins/plugins/storage/util/StorageUtil.java +++ b/src/main/java/com/google/jenkins/plugins/storage/util/StorageUtil.java @@ -41,10 +41,12 @@ public class StorageUtil { */ public static String getRelative(FilePath include, FilePath workspace) throws UploadException { LinkedList segments = new LinkedList(); + String includePath = include.getRemote(); + include = new FilePath(include.getChannel(), includePath.replace("\\", "/")); while (!include.equals(workspace)) { segments.push(include.getName()); include = include.getParent(); - if (Strings.isNullOrEmpty(include.getName())) { + if (include == null || Strings.isNullOrEmpty(include.getName())) { // When we reach "/" we're done either way. break; }