Merge pull request #103 from albers/golangmatch-filefilter

marcuslinke · marcuslinke · commit 02d3911bb2d9 · 2014-11-26T20:19:29.000+01:00
Make GoLangMatchFileFilter work on Windows
diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
@@ -3,6 +3,8 @@
  */
 package com.github.dockerjava.core;
 
+import static org.apache.commons.lang.StringUtils.stripStart;
+
 import java.io.File;
 import java.util.List;
 
@@ -23,9 +25,10 @@ public GoLangMatchFileFilter(File base, List<String> patterns) {
 
     @Override
     public boolean accept(File file) {
-    	String relativePath = file.getAbsolutePath().replaceFirst(base.getAbsolutePath() + File.separatorChar, "");
-    	
-    	boolean match = GoLangFileMatch.match(patterns, relativePath);
+        String basePath = base.getAbsolutePath() + File.separatorChar;
+        String relativePath = stripStart(file.getAbsolutePath(), basePath);
+        
+        boolean match = GoLangFileMatch.match(patterns, relativePath);
         return !match;
     }
 
