svn commit: r1702875 - in /tomcat/trunk/java/org/apache/tomcat/util/http: LegacyCookieProcessor.java SetCookieSupport.java

[markt]

Author: markt
Date: Mon Sep 14 09:07:34 2015
New Revision: 1702875

URL: http://svn.apache.org/r1702875
Log:
Remove deprecated code.

Removed:
    tomcat/trunk/java/org/apache/tomcat/util/http/SetCookieSupport.java
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1702875&r1=1702874&r2=1702875&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
Mon Sep 14 09:07:34 2015
@@ -84,6 +84,8 @@ public final class LegacyCookieProcessor
         ANCIENT_DATE = COOKIE_DATE_FORMAT.get().format(new Date(10000));
     }
 
+    private final boolean STRICT_SERVLET_COMPLIANCE =
+            
Boolean.getBoolean("org.apache.catalina.STRICT_SERVLET_COMPLIANCE");
 
     @SuppressWarnings("deprecation") // Default to false when deprecated code 
is removed
     private boolean allowEqualsInValue = CookieSupport.ALLOW_EQUALS_IN_VALUE;
@@ -98,9 +100,7 @@ public final class LegacyCookieProcessor
                                      // when deprecated code is removed
     private boolean preserveCookieHeader = 
CookieSupport.PRESERVE_COOKIE_HEADER;
 
-    @SuppressWarnings("deprecation") // Default to !STRICT_SERVLET_COMPLIANCE
-                                     // when deprecated code is removed
-    private boolean alwaysAddExpires = SetCookieSupport.ALWAYS_ADD_EXPIRES;
+    private boolean alwaysAddExpires = !STRICT_SERVLET_COMPLIANCE;
 
     private final BitSet httpSeparatorFlags = new BitSet(128);
 



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