Make handling of ServletDef.asyncSupport consistent

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@894375 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/deploy/ServletDef.java b/java/org/apache/catalina/deploy/ServletDef.java
index 72e2a4b..94134d3 100644 (file)
--- a/java/org/apache/catalina/deploy/ServletDef.java
+++ b/java/org/apache/catalina/deploy/ServletDef.java
@@ -225,13 +225,13 @@ public class ServletDef implements Serializable {
     /**
      * Does this servlet support async.
      */
-    private String asyncSupported = null;
+    private Boolean asyncSupported = null;
     
-    public String getAsyncSupported() {
+    public Boolean getAsyncSupported() {
         return this.asyncSupported;
     }
     
     public void setAsyncSupported(String asyncSupported) {
-        this.asyncSupported = asyncSupported;
+        this.asyncSupported = Boolean.valueOf(asyncSupported);
     }
 }

diff --git a/java/org/apache/catalina/startup/WebXml.java b/java/org/apache/catalina/startup/WebXml.java
index 65b4f29..20604af 100644 (file)
--- a/java/org/apache/catalina/startup/WebXml.java
+++ b/java/org/apache/catalina/startup/WebXml.java
@@ -1138,7 +1138,7 @@ public class WebXml {
             }
             if (servlet.getAsyncSupported() != null) {
                 wrapper.setAsyncSupported(
-                        Boolean.parseBoolean(servlet.getAsyncSupported()));
+                        servlet.getAsyncSupported().booleanValue());
             }
             context.addChild(wrapper);
         }
@@ -1624,7 +1624,7 @@ public class WebXml {
         }
         
         if (dest.getAsyncSupported() == null) {
-            dest.setAsyncSupported(src.getAsyncSupported());
+            dest.setAsyncSupported(src.getAsyncSupported().toString());
         } else if (src.getAsyncSupported() != null) {
             if (failOnConflict &&
                     !src.getAsyncSupported().equals(dest.getAsyncSupported())) {