jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r478982 - /jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
Date Fri, 24 Nov 2006 20:21:08 GMT
Author: jukka
Date: Fri Nov 24 12:21:08 2006
New Revision: 478982

URL: http://svn.apache.org/viewvc?view=rev&rev=478982
Log:
1.1: Merged revision 475669 (JCR-637)

Modified:
    jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java

Modified: jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java?view=diff&rev=478982&r1=478981&r2=478982
==============================================================================
--- jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
(original)
+++ jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
Fri Nov 24 12:21:08 2006
@@ -49,9 +49,9 @@
  * node type definition format and returns a list of NodeTypeDef objects that
  * can then be used to register node types.
  * <p/>
- * The BNF grammar of the compact node type definition:<br>
+ * The EBNF grammar of the compact node type definition:<br>
  * <pre>
- * cnd ::= {ns_mapping | node_type_def}
+ * cnd ::= ns_mapping* node_type_def+
  *
  * ns_mapping ::= "&lt;" prefix "=" namespace "&gt;"
  *
@@ -194,9 +194,11 @@
      */
     private void parse() throws ParseException {
         while (!currentTokenEquals(Lexer.EOF)) {
-            if (doNameSpace()) {
-                continue;
+            if (!doNameSpace()) {
+                break;
             }
+        }
+        while (!currentTokenEquals(Lexer.EOF)) {
             NodeTypeDef ntd = new NodeTypeDef();
             ntd.setOrderableChildNodes(false);
             ntd.setMixin(false);



Mime
View raw message