Issue JSP-21: Add options to disable jsr199, even with JDK6

Kin Man Chung · Kin Man Chung · commit 13e8109448e8 · 2011-05-23T23:37:19.000Z
svn path=/trunk/; revision=1386
diff --git a/impl/src/main/java/org/apache/jasper/compiler/Compiler.java b/impl/src/main/java/org/apache/jasper/compiler/Compiler.java
@@ -737,9 +737,12 @@ public void removeGeneratedClassFiles() {
      * The default is to use javac from ant.
      */
     private void initJavaCompiler() throws JasperException {
+        boolean disablejsr199 = Boolean.TRUE.toString().equals(
+            System.getProperty("org.apache.jasper.compiler.disablejsr199"));
         Double version = 
             Double.valueOf(System.getProperty("java.specification.version"));
-        if (version >= 1.6 || getClassFor("javax.tools.Tool") != null) {
+        if (!disablejsr199 &&
+               (version >= 1.6 || getClassFor("javax.tools.Tool") != null)) {
             // JDK 6 or bundled with jsr199 compiler
             javaCompiler = new Jsr199JavaCompiler();
         } else {
