svn commit: r1031572 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java

[iv...@apache.org]

Author: ivaynberg
Date: Fri Nov  5 14:11:31 2010
New Revision: 1031572

URL: http://svn.apache.org/viewvc?rev=1031572&view=rev
Log:

Issue: WICKET-3148

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=1031572&r1=1031571&r2=1031572&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Fri Nov  5 14:11:31 2010
@@ -336,18 +336,38 @@ public class WicketFilter implements Fil
 
 		if (isServlet)
 		{
-			WebServlet servlet = getClass().getAnnotation(WebServlet.class);
-			if (servlet != null)
+			try
 			{
-				patterns = servlet.urlPatterns();
+				if (Class.forName("javax.servlet.annotation.WebServlet") != null)
+				{
+					WebServlet servlet = getClass().getAnnotation(WebServlet.class);
+					if (servlet != null)
+					{
+						patterns = servlet.urlPatterns();
+					}
+				}
+			}
+			catch (ClassNotFoundException e)
+			{
+				// noop
 			}
 		}
 		else
 		{
-			WebFilter filter = getClass().getAnnotation(WebFilter.class);
-			if (filter != null)
+			try
+			{
+				if (Class.forName("javax.servlet.annotation.WebFilter") != null)
+				{
+					WebFilter filter = getClass().getAnnotation(WebFilter.class);
+					if (filter != null)
+					{
+						patterns = filter.urlPatterns();
+					}
+				}
+			}
+			catch (ClassNotFoundException e)
 			{
-				patterns = filter.urlPatterns();
+				// noop
 			}
 		}
 		if (patterns != null && patterns.length > 0)