svn commit: r568568 - in /wicket/trunk/jdk-1.4/wicket/src: main/java/org/apache/wicket/protocol/http/WicketFilter.java test/java/org/apache/wicket/protocol/http/WicketFilterTest.java

[jbq]

Author: jbq
Date: Wed Aug 22 04:33:41 2007
New Revision: 568568

URL: http://svn.apache.org/viewvc?rev=568568&view=rev
Log:
Fix WICKET-870 ignore white space in web.xml filter, filtermapping

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
    
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=568568&r1=568567&r2=568568&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
 Wed Aug 22 04:33:41 2007
@@ -481,7 +481,7 @@
                                        }
                                        else if (elem.isClose() && 
elem.getName().equals("url-pattern"))
                                        {
-                                               urlPattern = 
parser.getInputFromPositionMarker(elem.getPos()).toString();
+                                               urlPattern = 
parser.getInputFromPositionMarker(elem.getPos()).toString().trim();
                                        }
                                }
                                while (urlPattern == null || 
encounteredFilterName == null);

Modified: 
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java?rev=568568&r1=568567&r2=568568&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
 Wed Aug 22 04:33:41 2007
@@ -30,7 +30,7 @@
                        assertEquals("filtertest/", filterPath);
        }
 
-       public void bugTestFilterPath2() {
+       public void testFilterPath2() {
                InputStream in = 
WicketFilterTest.class.getResourceAsStream("web2.xml");
                String filterPath = getFilterPath("FilterTestApplication", in);
                assertEquals("filtertest/", filterPath);