You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2006/03/07 14:36:34 UTC

svn commit: r383887 - /incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java

Author: tripod
Date: Tue Mar  7 05:36:33 2006
New Revision: 383887

URL: http://svn.apache.org/viewcvs?rev=383887&view=rev
Log:
- reverting supertype handling due to failing tests

Modified:
    incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java?rev=383887&r1=383886&r2=383887&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java Tue Mar  7 05:36:33 2006
@@ -40,7 +40,6 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.HashSet;
 
 /**
  * CompactNodeTypeDefReader. Parses node type definitions written in the compact
@@ -270,7 +269,10 @@
      * @throws ParseException
      */
     private void doSuperTypes(NodeTypeDef ntd) throws ParseException {
-        HashSet supertypes = new HashSet();
+        // a set would be nicer here, in case someone defines a supertype twice.
+        // but due to issue [JCR-333], the resulting node type definition is
+        // not symmetric anymore and the tests will fail.
+        ArrayList supertypes = new ArrayList();
         if (!currentTokenEquals(Lexer.EXTENDS)) {
             return;
         }