diff --git a/src/etc/testcases/taskdefs/loadfile.xml b/src/etc/testcases/taskdefs/loadfile.xml
index b90fad278..9b91d7843 100644
--- a/src/etc/testcases/taskdefs/loadfile.xml
+++ b/src/etc/testcases/taskdefs/loadfile.xml
@@ -87,6 +87,42 @@ Hello World!</echo>
       </loadfile>
   </target>
 
+  <target name="testStripJavaComments"
+    depends="init">
+      <echo file="loadfile1.tmp">
+/*
+Comment "1"
+*/
+public class test1 {
+    //Some comment
+    int x = 1/2;
+    private static final String GREETING="*/Hello/*";
+    private static final String GREETING1="/*Hello*/";
+
+    public static void main( String args[] ) {
+    }
+}</echo>
+      <echo file="nocomments.tmp">
+
+public class test1 {
+    
+    int x = 1/2;
+    private static final String GREETING="*/Hello/*";
+    private static final String GREETING1="/*Hello*/";
+
+    public static void main( String args[] ) {
+    }
+}</echo>
+      <loadfile srcFile="loadfile1.tmp" 
+        property="testStripJavaComments">
+        <filterchain>
+          <stripjavacomments/>
+        </filterchain>
+      </loadfile>
+      <loadfile srcFile="nocomments.tmp" 
+        property="expected"/>
+  </target>
+
   <target name="testOneLine"
     depends="init">
     <echo
@@ -105,6 +141,7 @@ Hello World!</echo>
 
   <target name="cleanup">
     <delete file="loadfile1.tmp"/>
+    <delete file="nocomments.tmp"/>
   </target>
 
   </project>
diff --git a/src/main/org/apache/tools/ant/filters/StripJavaComments.java b/src/main/org/apache/tools/ant/filters/StripJavaComments.java
index 1d5df37f1..9a4afe283 100644
--- a/src/main/org/apache/tools/ant/filters/StripJavaComments.java
+++ b/src/main/org/apache/tools/ant/filters/StripJavaComments.java
@@ -62,8 +62,6 @@ import java.io.Reader;
  * (if you have more complex Java parsing needs, use a real lexer).
  * Since this class heavily relies on the single char read function,
  * you are reccomended to make it work on top of a buffered reader.
- *
- * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 public final class StripJavaComments
     extends BaseFilterReader
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java
index f4703c314..98152b4fc 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java
@@ -173,6 +173,17 @@ public class LoadFileTest extends BuildFileTest {
         }
     }
 
+    /**
+     * A unit test for JUnit
+     */
+    public void testStripJavaComments()
+            throws BuildException {
+        executeTarget("testStripJavaComments");
+        String expected = project.getProperty("expected");
+        if(!project.getProperty("testStripJavaComments").equals(expected)) {
+            fail("StripJavaComments broken");
+        }
+    }
 
     /**
      * A unit test for JUnit