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/03/27 18:18:24 UTC
svn commit: r1461720 - in
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate:
ItemDelegate.java NodeDelegate.java SessionDelegate.java
Author: mduerig
Date: Wed Mar 27 17:18:24 2013
New Revision: 1461720
URL: http://svn.apache.org/r1461720
Log:
OAK-672: Avoid JCR APIs calling other JCR APIs
FIXME: don't leak Tree, Root and related entities through delegates
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java?rev=1461720&r1=1461719&r2=1461720&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java Wed Mar 27 17:18:24 2013
@@ -107,7 +107,7 @@ public abstract class ItemDelegate {
* @return tree location of the underlying item
* @throws InvalidItemStateException if the location points to a stale item
*/
- @Nonnull
+ @Nonnull // FIXME this should be package private. OAK-672
public TreeLocation getLocation() throws InvalidItemStateException {
TreeLocation location = loadLocation();
if (!location.exists()) {
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java?rev=1461720&r1=1461719&r2=1461720&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java Wed Mar 27 17:18:24 2013
@@ -230,7 +230,7 @@ public class NodeDelegate extends ItemDe
//------------------------------------------------------------< internal >---
- @Nonnull // FIXME this should be package private
+ @Nonnull // FIXME this should be package private. OAK-672
public Tree getTree() throws InvalidItemStateException {
Tree tree = getLocation().getTree();
if (tree == null) {
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1461720&r1=1461719&r2=1461720&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java Wed Mar 27 17:18:24 2013
@@ -292,7 +292,7 @@ public class SessionDelegate {
//-----------------------------------------------------------< internal >---
- @Nonnull // FIXME this should be package private
+ @Nonnull // FIXME this should be package private. OAK-672
public Root getRoot() {
return root;
}