From e52b987d30e5eccda2fb1d223ffb8e9b6edb4a90 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Thu, 11 Jan 2007 14:02:50 +0000
Subject: [PATCH] Bug 41349: rmic should strip out -J compiler args when not
 forking

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@495229 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  4 ++
 src/etc/testcases/taskdefs/rmic/rmic.xml      | 16 +++++++
 .../ant/taskdefs/rmic/DefaultRmicAdapter.java | 42 ++++++++++++++++++-
 .../tools/ant/taskdefs/rmic/SunRmic.java      | 10 +++++
 .../tools/ant/taskdefs/rmic/WLRmic.java       | 10 +++++
 .../tools/ant/taskdefs/RmicAdvancedTest.java  | 20 ++++++++-
 6 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 6978db9a7..2055f33f7 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -34,6 +34,10 @@ Fixed bugs:
 * Regression: NPE was thrown when using <pathconvert> against a
   (third-party instantiated) fileset with null Project reference.
 
+* Strip out all -J arguments to non forking rmic adapters, specifically
+  the Sun and Weblogic compilers.
+  Bug report 41349  
+
 Other changes:
 --------------
 
diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml b/src/etc/testcases/taskdefs/rmic/rmic.xml
index 149f3e777..24283f02b 100644
--- a/src/etc/testcases/taskdefs/rmic/rmic.xml
+++ b/src/etc/testcases/taskdefs/rmic/rmic.xml
@@ -153,6 +153,14 @@
     <assertBaseCompiled/>
   </target>
 
+
+  <target name="testRmicJArg" if="rmic.present" depends="init">
+    <base-rmic compiler="sun">
+      <compilerarg value="-J-mx256m" />
+    </base-rmic>
+    <assertBaseCompiled/>
+  </target>
+
   <target name="testKaffe" if="kaffe.present" depends="init">
     <base-rmic
       compiler="kaffe"
@@ -166,6 +174,14 @@
       />
   </target>
 
+  <target name="testWlrmicJArg" if="wlrmic.present" depends="init">
+    <base-rmic
+        compiler="weblogic"
+        >
+      <compilerarg value="-J-mx256m" />
+    </base-rmic>
+  </target>
+
   <target name="testForking" if="rmic.present" depends="init">
     <base-rmic
       compiler="forking"
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
index c7583e43d..2dd41608a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
@@ -21,6 +21,9 @@ package org.apache.tools.ant.taskdefs.rmic;
 import java.io.File;
 import java.util.Random;
 import java.util.Vector;
+import java.util.List;
+import java.util.ArrayList;
+
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Rmic;
 import org.apache.tools.ant.types.Commandline;
@@ -249,12 +252,49 @@ public abstract class DefaultRmicAdapter implements RmicAdapter {
             cmd.createArgument().setValue("-g");
         }
 
-        cmd.addArguments(attributes.getCurrentCompilerArgs());
+        String[] compilerArgs = attributes.getCurrentCompilerArgs();
+        compilerArgs = preprocessCompilerArgs(compilerArgs);
+        cmd.addArguments(compilerArgs);
 
         logAndAddFilesToCompile(cmd);
         return cmd;
      }
 
+    /**
+     * Preprocess the compiler arguments in any way you see fit.
+     * This is to allow compiler adapters to validate or filter the arguments.
+     * The base implementation returns the original compiler arguments unchanged.
+     * @param compilerArgs the original compiler arguments
+     * @return the filtered set.
+     */
+    protected String[] preprocessCompilerArgs(String[] compilerArgs) {
+        return compilerArgs;
+    }
+
+
+    /**
+     * Strip out all -J args from the command list. Invoke this from
+     * {@link #preprocessCompilerArgs(String[])} if you have a non-forking
+     * compiler. 
+     * @param compilerArgs the original compiler arguments
+     * @return the filtered set.
+     */
+    protected String[] filterJvmCompilerArgs(String[] compilerArgs) {
+        int len = compilerArgs.length;
+        List args=new ArrayList(len);
+        for(int i=0;i<len;i++) {
+            String arg=compilerArgs[i];
+            if(!arg.startsWith("-J")) {
+                args.add(arg);
+            } else {
+                attributes.log("Dropping "+arg+" from compiler arguments");
+            }
+        }
+        int count=args.size();
+        return (String[]) args.toArray(new String[count]);
+    }
+
+
     /**
      * Logs the compilation parameters, adds the files to compile and logs the
      * &quot;niceSourceList&quot;
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
index 3afe7298f..bde37393c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
@@ -100,4 +100,14 @@ public class SunRmic extends DefaultRmicAdapter {
             }
         }
     }
+
+
+    /**
+     * Strip out all -J args from the command list.
+     * @param compilerArgs the original compiler arguments
+     * @return the filtered set.
+     */
+    protected String[] preprocessCompilerArgs(String[] compilerArgs) {
+        return filterJvmCompilerArgs(compilerArgs);
+    }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
index e48b1e580..cc4c1cde2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
@@ -106,4 +106,14 @@ public class WLRmic extends DefaultRmicAdapter {
     public String getSkelClassSuffix() {
         return WL_RMI_SKEL_SUFFIX;
     }
+
+    /**
+     * Strip out all -J args from the command list.
+     *
+     * @param compilerArgs the original compiler arguments
+     * @return the filtered set.
+     */
+    protected String[] preprocessCompilerArgs(String[] compilerArgs) {
+        return filterJvmCompilerArgs(compilerArgs);
+    }    
 }
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
index 2925b790d..4a562a026 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
@@ -65,11 +65,20 @@ public class RmicAdvancedTest extends BuildFileTest {
         executeTarget("testEmpty");
     }
     /**
-     * A unit test for JUnit
+     * test sun's rmic compiler
      */
     public void testRmic() throws Exception {
         executeTarget("testRmic");
     }
+
+    /**
+     * test sun's rmic compiler strips
+     * out -J arguments when not forking
+     */
+    public void testRmicJArg() throws Exception {
+        executeTarget("testRmicJArg");
+    }
+
     /**
      * A unit test for JUnit
      */
@@ -78,12 +87,19 @@ public class RmicAdvancedTest extends BuildFileTest {
     }
 
     /**
-     * A unit test for JUnit
+     * test weblogic
      */
     public void testWlrmic() throws Exception {
         executeTarget("testWlrmic");
     }
 
+    /**
+     *  test weblogic's stripping of -J args
+     */
+    public void testWlrmicJArg() throws Exception {
+        executeTarget("testWlrmicJArg");
+    }
+
     /**
      * test the forking compiler
      */