From d2bff5c8b562ae184682c9fc7eabd372b0ed7597 Mon Sep 17 00:00:00 2001 From: Rob Stryker Date: Thu, 26 Oct 2023 15:24:37 -0400 Subject: [PATCH] Fixes #293 - file watcher not ensuring paths are relative on windows Signed-off-by: Rob Stryker --- .../spi/publishing/AbstractFilesystemPublishController.java | 2 -- .../rsp/server/model/internal/publishing/DeployableDelta.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/framework/bundles/org.jboss.tools.rsp.server.spi/src/main/java/org/jboss/tools/rsp/server/spi/publishing/AbstractFilesystemPublishController.java b/framework/bundles/org.jboss.tools.rsp.server.spi/src/main/java/org/jboss/tools/rsp/server/spi/publishing/AbstractFilesystemPublishController.java index 1799f91a2..1ee2395a7 100644 --- a/framework/bundles/org.jboss.tools.rsp.server.spi/src/main/java/org/jboss/tools/rsp/server/spi/publishing/AbstractFilesystemPublishController.java +++ b/framework/bundles/org.jboss.tools.rsp.server.spi/src/main/java/org/jboss/tools/rsp/server/spi/publishing/AbstractFilesystemPublishController.java @@ -297,8 +297,6 @@ protected int fullPublishCopyExplodedModule(DeployableReference ref, int publish protected int incrementalPublishCopyExplodedModule(DeployableReference opts, IDeployableDelta delta) throws CoreException { File dest = getDestinationPath(opts).toFile(); - Path src = new File(opts.getPath()).toPath(); - List errors = new ArrayList<>(); Map deltaVals = delta.getResourceDeltaMap(); for( Map.Entry entry : deltaVals.entrySet()) { diff --git a/framework/bundles/org.jboss.tools.rsp.server/src/main/java/org/jboss/tools/rsp/server/model/internal/publishing/DeployableDelta.java b/framework/bundles/org.jboss.tools.rsp.server/src/main/java/org/jboss/tools/rsp/server/model/internal/publishing/DeployableDelta.java index 6a758b8de..f60aa9a7d 100644 --- a/framework/bundles/org.jboss.tools.rsp.server/src/main/java/org/jboss/tools/rsp/server/model/internal/publishing/DeployableDelta.java +++ b/framework/bundles/org.jboss.tools.rsp.server/src/main/java/org/jboss/tools/rsp/server/model/internal/publishing/DeployableDelta.java @@ -8,6 +8,7 @@ ******************************************************************************/ package org.jboss.tools.rsp.server.model.internal.publishing; +import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardWatchEventKinds; @@ -24,7 +25,6 @@ public class DeployableDelta implements IDeployableDelta { - private static final int UNKNOWN_KIND = -1; private DeployableReference reference; private Map changes; @@ -99,7 +99,7 @@ public void registerChange(FileWatcherEvent event, DeploymentAssemblyFile assemb Path relativeToSource = mappingSourcePath.relativize(changedFile); String depPath = matchedMapping.getDeployPath(); - depPath = depPath.startsWith("/") ? depPath.substring(1) : depPath; + depPath = depPath.startsWith(File.separator) ? depPath.substring(1) : depPath; Path mappingDestPath = Paths.get(depPath); Path relativeToOutput = mappingDestPath.resolve(relativeToSource); registerChange(event, relativeToOutput);