Fixes #293 - file watcher not ensuring paths are relative on windows

Signed-off-by: Rob Stryker <[email protected]>
redhat-developer · Oct 26, 2023 · d2bff5c · d2bff5c
1 parent 725ceaf
commit d2bff5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...n/java/org/jboss/tools/rsp/server/spi/publishing/AbstractFilesystemPublishController.java b/...n/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<String> errors = new ArrayList<>();
 		Map<Path, IDeployableResourceDelta> deltaVals = delta.getResourceDeltaMap();
 		for( Map.Entry<Path, IDeployableResourceDelta> entry : deltaVals.entrySet()) {

diff --git a/...r/src/main/java/org/jboss/tools/rsp/server/model/internal/publishing/DeployableDelta.java b/...r/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<Path, IDeployableResourceDelta> 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);