You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2012/07/02 18:23:44 UTC
svn commit: r1356322 - in /jackrabbit/oak/trunk:
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
oak-parent/pom.xml
Author: jukka
Date: Mon Jul 2 16:23:43 2012
New Revision: 1356322
URL: http://svn.apache.org/viewvc?rev=1356322&view=rev
Log:
Prepare for the 0.3 release by temporarily reverting back to the latest release from Jackrabbit trunk
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1356322&r1=1356321&r2=1356322&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java Mon Jul 2 16:23:43 2012
@@ -449,8 +449,15 @@ public class NodeImpl extends ItemImpl i
checkStatus();
Iterator<NodeDelegate> children = dlg.getChildren();
- long size = dlg.getChildCount();
- return new NodeIteratorAdapter(nodeIterator(children), size);
+ final long size = dlg.getChildCount();
+ return new NodeIteratorAdapter(nodeIterator(children)) {
+ @Override
+ public long getSize() {
+ return size;
+ }
+ };
+ // TODO: Restore the following when we're back on 2.6-SNAPSHOT
+ // return new NodeIteratorAdapter(nodeIterator(children), size);
}
@Override
@@ -514,8 +521,15 @@ public class NodeImpl extends ItemImpl i
checkStatus();
Iterator<PropertyDelegate> properties = dlg.getProperties();
- long size = dlg.getPropertyCount();
- return new PropertyIteratorAdapter(propertyIterator(properties), size);
+ final long size = dlg.getPropertyCount();
+ return new PropertyIteratorAdapter(propertyIterator(properties)) {
+ @Override
+ public long getSize() {
+ return size;
+ }
+ };
+ // TODO: Restore the following when we're back on 2.6-SNAPSHOT
+ // return new PropertyIteratorAdapter(propertyIterator(properties), size);
}
@Override
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1356322&r1=1356321&r2=1356322&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Jul 2 16:23:43 2012
@@ -39,7 +39,7 @@
<project.reporting.outputEncoding>
${project.build.sourceEncoding}
</project.reporting.outputEncoding>
- <jackrabbit.version>2.6-SNAPSHOT</jackrabbit.version>
+ <jackrabbit.version>2.5.0</jackrabbit.version>
</properties>
<issueManagement>