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 md...@apache.org on 2013/05/02 00:08:23 UTC
svn commit: r1478214 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core:
RootImpl.java TreeImpl.java
Author: mduerig
Date: Wed May 1 22:08:22 2013
New Revision: 1478214
URL: http://svn.apache.org/r1478214
Log:
OAK-798: Review / refactor TreeImpl and related classes
Remove deprecated internal API
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java?rev=1478214&r1=1478213&r2=1478214&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java Wed May 1 22:08:22 2013
@@ -177,8 +177,8 @@ public class RootImpl implements Root {
@Override
public boolean move(String sourcePath, String destPath) {
checkLive();
- TreeImpl destParent = rootTree.getTreeOrNull(getParentPath(destPath));
- if (destParent == null) {
+ TreeImpl destParent = rootTree.getTree(getParentPath(destPath));
+ if (!destParent.exists()) {
return false;
}
purgePendingChanges();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java?rev=1478214&r1=1478213&r2=1478214&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Wed May 1 22:08:22 2013
@@ -413,20 +413,6 @@ public class TreeImpl implements Tree {
}
/**
- * Get a tree for the tree identified by {@code path}.
- *
- * @param path the path to the child
- * @return a {@link Tree} instance for the child at {@code path} or
- * {@code null} if no such tree exits or if the tree is not accessible.
- */
- @CheckForNull
- @Deprecated
- TreeImpl getTreeOrNull(String path) {
- TreeImpl child = getTree(path);
- return child.nodeBuilder.exists() ? child : null;
- }
-
- /**
* Update the child order with children that have been removed or added.
* Added children are appended to the end of the {@link #OAK_CHILD_ORDER}
* property.