Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 67053 invoked from network); 15 Jan 2010 00:38:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jan 2010 00:38:30 -0000 Received: (qmail 56483 invoked by uid 500); 15 Jan 2010 00:38:29 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 56398 invoked by uid 500); 15 Jan 2010 00:38:29 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 56387 invoked by uid 99); 15 Jan 2010 00:38:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 00:38:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 00:38:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3565F238890A; Fri, 15 Jan 2010 00:38:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r899498 - in /tomcat/trunk/java: javax/servlet/ServletContext.java org/apache/catalina/core/ApplicationContext.java org/apache/catalina/core/ApplicationContextFacade.java org/apache/jasper/servlet/JspCServletContext.java Date: Fri, 15 Jan 2010 00:38:05 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100115003805.3565F238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Jan 15 00:38:04 2010 New Revision: 899498 URL: http://svn.apache.org/viewvc?rev=899498&view=rev Log: API uses Set rather than EnumSet Modified: tomcat/trunk/java/javax/servlet/ServletContext.java tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Modified: tomcat/trunk/java/javax/servlet/ServletContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=899498&r1=899497&r2=899498&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/ServletContext.java (original) +++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Jan 15 00:38:04 2010 @@ -19,7 +19,6 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import java.util.EnumSet; import java.util.Enumeration; import java.util.EventListener; import java.util.Map; @@ -854,7 +853,7 @@ * TODO SERVLET3 - Add comments */ public void setSessionTrackingModes( - EnumSet sessionTrackingModes) + Set sessionTrackingModes) throws IllegalStateException, IllegalArgumentException; /** Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=899498&r1=899497&r2=899498&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Jan 15 00:38:04 2010 @@ -171,9 +171,9 @@ /** * Session tracking modes */ - private EnumSet sessionTrackingModes = null; - private EnumSet defaultSessionTrackingModes = null; - private EnumSet supportedSessionTrackingModes = null; + private Set sessionTrackingModes = null; + private Set defaultSessionTrackingModes = null; + private Set supportedSessionTrackingModes = null; // --------------------------------------------------------- Public Methods @@ -963,7 +963,7 @@ * used by this context has the attribute secure set to * true. */ - public EnumSet getDefaultSessionTrackingModes() { + public Set getDefaultSessionTrackingModes() { return defaultSessionTrackingModes; } @@ -994,7 +994,7 @@ * Return the supplied value if one was previously set, else return the * defaults. */ - public EnumSet getEffectiveSessionTrackingModes() { + public Set getEffectiveSessionTrackingModes() { if (sessionTrackingModes != null) { return sessionTrackingModes; } @@ -1014,7 +1014,7 @@ * tracking mode is requested */ public void setSessionTrackingModes( - EnumSet sessionTrackingModes) { + Set sessionTrackingModes) { if (context.getAvailable()) { throw new IllegalStateException( Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=899498&r1=899497&r2=899498&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java Fri Jan 15 00:38:04 2010 @@ -509,7 +509,7 @@ @SuppressWarnings("unchecked") // doPrivileged() returns the correct type - public EnumSet getDefaultSessionTrackingModes() { + public Set getDefaultSessionTrackingModes() { if (SecurityUtil.isPackageProtectionEnabled()) { return (EnumSet) doPrivileged("getDefaultSessionTrackingModes", null); @@ -519,7 +519,7 @@ } @SuppressWarnings("unchecked") // doPrivileged() returns the correct type - public EnumSet getEffectiveSessionTrackingModes() { + public Set getEffectiveSessionTrackingModes() { if (SecurityUtil.isPackageProtectionEnabled()) { return (EnumSet) doPrivileged("getEffectiveSessionTrackingModes", null); @@ -540,7 +540,7 @@ public void setSessionTrackingModes( - EnumSet sessionTrackingModes) { + Set sessionTrackingModes) { if (SecurityUtil.isPackageProtectionEnabled()) { doPrivileged("setSessionTrackingModes", new Object[]{sessionTrackingModes}); Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=899498&r1=899497&r2=899498&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Fri Jan 15 00:38:04 2010 @@ -463,12 +463,12 @@ } - public EnumSet getDefaultSessionTrackingModes() { + public Set getDefaultSessionTrackingModes() { return EnumSet.noneOf(SessionTrackingMode.class); } - public EnumSet getEffectiveSessionTrackingModes() { + public Set getEffectiveSessionTrackingModes() { return EnumSet.noneOf(SessionTrackingMode.class); } @@ -479,7 +479,7 @@ public void setSessionTrackingModes( - EnumSet sessionTrackingModes) { + Set sessionTrackingModes) { // Do nothing } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org