Author: markt
Date: Mon Feb 6 17:07:22 2012
New Revision: 1241079
URL: http://svn.apache.org/viewvc?rev=1241079&view=rev
Log:
Use the interface rather than the default implementation
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1241079&r1=1241078&r2=1241079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java Mon Feb
6 17:07:22 2012
@@ -26,7 +26,7 @@ import javax.annotation.security.RunAs;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.core.StandardWrapper;
+import org.apache.catalina.Wrapper;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceEnvRef;
@@ -92,14 +92,14 @@ public class WebAnnotationSet {
protected static void loadApplicationServletAnnotations(Context context) {
ClassLoader classLoader = context.getLoader().getClassLoader();
- StandardWrapper wrapper = null;
+ Wrapper wrapper = null;
Class<?> classClass = null;
Container[] children = context.findChildren();
for (int i = 0; i < children.length; i++) {
- if (children[i] instanceof StandardWrapper) {
+ if (children[i] instanceof Wrapper) {
- wrapper = (StandardWrapper) children[i];
+ wrapper = (Wrapper) children[i];
if (wrapper.getServletClass() == null) {
continue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]