tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r894375 - in /tomcat/trunk/java/org/apache/catalina: deploy/ServletDef.java startup/WebXml.java
Date Tue, 29 Dec 2009 13:03:46 GMT
Author: markt
Date: Tue Dec 29 13:03:46 2009
New Revision: 894375

URL: http://svn.apache.org/viewvc?rev=894375&view=rev
Log:
Make handling of ServletDef.asyncSupport consistent

Modified:
    tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
    tomcat/trunk/java/org/apache/catalina/startup/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java?rev=894375&r1=894374&r2=894375&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java Tue Dec 29 13:03:46 2009
@@ -225,13 +225,13 @@
     /**
      * 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);
     }
 }

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebXml.java?rev=894375&r1=894374&r2=894375&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Tue Dec 29 13:03:46 2009
@@ -1138,7 +1138,7 @@
             }
             if (servlet.getAsyncSupported() != null) {
                 wrapper.setAsyncSupported(
-                        Boolean.parseBoolean(servlet.getAsyncSupported()));
+                        servlet.getAsyncSupported().booleanValue());
             }
             context.addChild(wrapper);
         }
@@ -1624,7 +1624,7 @@
         }
         
         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())) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message