From 6e192308c2bd730858d24099062712839655a3da Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sun, 17 Jun 2012 06:01:27 +0000
Subject: [PATCH] packagemapper mapped too uch with handlediresep true.  PR
 53399

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1351053 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                           |  4 ++++
 .../apache/tools/ant/util/PackageNameMapper.java   |  2 +-
 .../antunit/types/mappers/packagemapper-test.xml   | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index 0a05714a5..a45eb99e5 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -37,6 +37,10 @@ Fixed bugs:
  * ExtensionPoint doesn't work with nested import/include
    Bugzilla Report 53405.
 
+ * <packagemapper> failed to strip the non-matched parts with
+   handledirsep="true".
+   Bugzilla Report 53399.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/util/PackageNameMapper.java b/src/main/org/apache/tools/ant/util/PackageNameMapper.java
index 87477c3d9..30256670a 100644
--- a/src/main/org/apache/tools/ant/util/PackageNameMapper.java
+++ b/src/main/org/apache/tools/ant/util/PackageNameMapper.java
@@ -41,7 +41,7 @@ public class PackageNameMapper extends GlobPatternMapper {
         String var = name.substring(prefixLength,
                 name.length() - postfixLength);
         if (getHandleDirSep()) {
-            var = name.replace('/', '.').replace('\\', '.');
+            var = var.replace('/', '.').replace('\\', '.');
         }
         return var.replace(File.separatorChar, '.');
     }
diff --git a/src/tests/antunit/types/mappers/packagemapper-test.xml b/src/tests/antunit/types/mappers/packagemapper-test.xml
index f5cada734..b080e4063 100644
--- a/src/tests/antunit/types/mappers/packagemapper-test.xml
+++ b/src/tests/antunit/types/mappers/packagemapper-test.xml
@@ -31,6 +31,20 @@
       <string>foo\bar</string>
       <packagemapper from="*" to="*" handledirsep="true"/>
     </pathconvert>
+    <au:assertPropertyEquals name="p2" value="foo.bar"/>
+  </target>
+
+  <target name="testMapsOnlySubstring"
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53399">
+    <pathconvert property="p1">
+      <string>xyzzy${file.separator}foo${file.separator}bar</string>
+      <packagemapper from="xyzzy/*" to="*" handledirsep="false"/>
+    </pathconvert>
     <au:assertPropertyEquals name="p1" value="foo.bar"/>
+    <pathconvert property="p2">
+      <string>xyzzy${file.separator}foo${file.separator}bar</string>
+      <packagemapper from="xyzzy/*" to="*" handledirsep="true"/>
+    </pathconvert>
+    <au:assertPropertyEquals name="p2" value="foo.bar"/>
   </target>
 </project>
\ No newline at end of file