You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2005/02/22 19:22:21 UTC

svn commit: r154884 - in incubator/jackrabbit/trunk/src: java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java test/org/apache/jackrabbit/init/NodeTestData.java

Author: stefan
Date: Tue Feb 22 10:22:18 2005
New Revision: 154884

URL: http://svn.apache.org/viewcvs?view=rev&rev=154884
Log:
- fixing testcase for binary property encoding
- fixing Node.getNodes(String) & Node.getProperties(String)

Modified:
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java
    incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java?view=diff&r1=154883&r2=154884
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java Tue Feb 22 10:22:18 2005
@@ -101,7 +101,9 @@
         // split pattern
         StringTokenizer st = new StringTokenizer(pattern, OR, false);
         while (st.hasMoreTokens()) {
-            if (internalMatches(name, st.nextToken(), 0, 0)) {
+            // remove leading & trailing whitespace from token
+            String token = st.nextToken().trim();
+            if (internalMatches(name, token, 0, 0)) {
                 return true;
             }
         }

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java?view=diff&r1=154883&r2=154884
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/init/NodeTestData.java Tue Feb 22 10:22:18 2005
@@ -36,7 +36,7 @@
     private static final String TEST_DATA_PATH = "testdata/node";
 
     /** The encoding for the test resource */
-    private static final String ENCODING = "ISO-8859-1";
+    private static final String ENCODING = "UTF-8";
 
     /** Resolved QName for nt:resource */
     private String ntResource;