Fix#8 the default value of keepgenerated is false only in JDK 6.

Signed-off-by: hs536 <sawamura.hiroki@fujitsu.com>
eclipse-ee4j · Jun 21, 2021 · 4a9ab1f · 4a9ab1f
1 parent deb28ea
commit 4a9ab1f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/org/apache/jasper/EmbeddedServletOptions.java b/src/main/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -497,8 +497,8 @@ public EmbeddedServletOptions(ServletConfig config, ServletContext context) {
         }
         // END SJSAS 6384538
 
-        // keepgenerated default is false for JDK6 for later, true otherwise
-        keepGenerated = getBoolean(config, !isJDK6(), "keepgenerated");
+        // keepgenerated default is false for JDK6 or later, true otherwise
+        keepGenerated = getBoolean(config, !isJDK6orLater(), "keepgenerated");
         saveBytecode = getBoolean(config, saveBytecode, "saveBytecode");
         trimSpaces = getBoolean(config, trimSpaces, "trimSpaces");
         isPoolingEnabled = getBoolean(config, isPoolingEnabled, "enablePooling");
@@ -725,7 +725,8 @@ private boolean getBoolean(ServletConfig config, boolean init, String param) {
     /*
      * returns true if running with JDK 6 or later.
      */
-    private boolean isJDK6() {
-        return "1.6".equals(System.getProperty("java.specification.version"));
+    private boolean isJDK6orLater() {
+        Double version = Double.valueOf(System.getProperty("java.specification.version"));
+        return (version >= 1.6);
     }
 }