You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/09/07 11:22:37 UTC
svn commit: r1166077 -
/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Author: markt
Date: Wed Sep 7 09:22:36 2011
New Revision: 1166077
URL: http://svn.apache.org/viewvc?rev=1166077&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51744
Use method Set rather than EnumSet since the method signature uses Set.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
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=1166077&r1=1166076&r2=1166077&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java Wed Sep 7 09:22:36 2011
@@ -27,7 +27,6 @@ import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.EnumSet;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.HashMap;
@@ -118,7 +117,7 @@ public class ApplicationContextFacade im
classCache.put("getRealPath", clazz);
classCache.put("getAttribute", clazz);
classCache.put("log", clazz);
- classCache.put("setSessionTrackingModes", new Class[]{EnumSet.class} );
+ classCache.put("setSessionTrackingModes", new Class[]{Set.class} );
}
@@ -571,7 +570,7 @@ public class ApplicationContextFacade im
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (EnumSet<SessionTrackingMode>)
+ return (Set<SessionTrackingMode>)
doPrivileged("getDefaultSessionTrackingModes", null);
} else {
return context.getDefaultSessionTrackingModes();
@@ -582,7 +581,7 @@ public class ApplicationContextFacade im
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (EnumSet<SessionTrackingMode>)
+ return (Set<SessionTrackingMode>)
doPrivileged("getEffectiveSessionTrackingModes", null);
} else {
return context.getEffectiveSessionTrackingModes();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org