jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r698209 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/util/DOMWalker.java test/java/org/apache/jackrabbit/core/util/DOMWalkerTest.java
Date Tue, 23 Sep 2008 15:57:43 GMT
Author: jukka
Date: Tue Sep 23 08:57:43 2008
New Revision: 698209

URL: http://svn.apache.org/viewvc?rev=698209&view=rev
Log:
JCR-1755: ClassCastException when registering custom node by XML file

Avoid the ClassCastException in DOMWalker.

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/DOMWalkerTest.java
  (with props)
Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java?rev=698209&r1=698208&r2=698209&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java
Tue Sep 23 08:57:43 2008
@@ -212,7 +212,10 @@
         }
 
         if (name.equals(current.getNodeName())) {
-            current = (Element) current.getParentNode();
+            Node parent = current.getParentNode();
+            if (parent instanceof Element) {
+                current = (Element) parent;
+            }
         }
         return false;
     }

Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/DOMWalkerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/DOMWalkerTest.java?rev=698209&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/DOMWalkerTest.java
(added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/DOMWalkerTest.java
Tue Sep 23 08:57:43 2008
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.util;
+
+import java.io.ByteArrayInputStream;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit tests for the {@link DOMWalker} class.
+ */
+public class DOMWalkerTest extends TestCase {
+
+    /**
+     * <a href="https://issues.apache.org/jira/browse/JCR-1755">JCR-1755</a>:
+     * ClassCastException when registering custom node by XML file
+     */
+    public void testIterateTopLevelElements() throws Exception {
+        DOMWalker walker = new DOMWalker(
+                new ByteArrayInputStream("<nodeType/>".getBytes("UTF-8")));
+        try {
+            while (walker.iterateElements("nodeType")) {
+                // do nothing
+            }
+        } catch (ClassCastException e) {
+            fail("JCR-1755: ClassCastException when registering"
+                    + " custom node by XML file");
+        }
+    }
+
+}

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/DOMWalkerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message