Author: remy.maucherat(a)jboss.com
Date: 2008-07-17 09:13:43 -0400 (Thu, 17 Jul 2008)
New Revision: 717
Modified:
trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Log:
- Fix ooops for instance manager checks.
Modified: trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
===================================================================
--- trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 2008-07-15 16:09:39
UTC (rev 716)
+++ trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 2008-07-17 13:13:43
UTC (rev 717)
@@ -352,9 +352,9 @@
private void checkAccess(Class clazz) {
if (privileged) return;
- if (clazz.isAssignableFrom(Filter.class)) {
+ if (Filter.class.isAssignableFrom(clazz)) {
checkAccess(clazz, restrictedFilters);
- } else if (clazz.isAssignableFrom(Servlet.class)) {
+ } else if (Servlet.class.isAssignableFrom(clazz)) {
checkAccess(clazz, restrictedServlets);
} else {
checkAccess(clazz, restrictedListeners);
@@ -364,7 +364,7 @@
private void checkAccess(Class clazz, Properties restricted) {
while (clazz != null) {
if ("restricted".equals(restricted.getProperty(clazz.getName())))
{
- throw new SecurityException("Restricted class" + clazz);
+ throw new SecurityException("Restricted class: " +
clazz.getName());
}
clazz = clazz.getSuperclass();
}