You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by dp...@apache.org on 2008/04/09 16:05:57 UTC
svn commit: r646361 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
Author: dpfister
Date: Wed Apr 9 07:05:56 2008
New Revision: 646361
URL: http://svn.apache.org/viewvc?rev=646361&view=rev
Log:
JCR-1104 - JSR 283 support
- shareble nodes (work in progress)
- remove unreachable code
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=646361&r1=646360&r2=646361&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Wed Apr 9 07:05:56 2008
@@ -428,30 +428,8 @@
}
if (depth < 1) {
- // TODO SN: move this to HierarchyManager
- // if state is shareable, it has actually more than one parent
- if (state.isNode()) {
- NodeState ns = (NodeState) state;
- if (ns.isShareable()) {
- Set sharedSet = ns.getSharedSet();
- if (ns.hasOverlayedState()) {
- sharedSet = ((NodeState) ns.getOverlayedState()).getSharedSet();
- }
- Iterator sharedParentIds = sharedSet.iterator();
- while (sharedParentIds.hasNext()) {
- NodeId sharedParentId = (NodeId) sharedParentIds.next();
- int depth2 = hierMgr.getRelativeDepth(parentId, sharedParentId);
- if (depth2 >= 0) {
- depth = depth2 + 1;
- break;
- }
- }
- }
- }
- if (depth < 1) {
- // not a descendant
- continue;
- }
+ // not a descendant
+ continue;
}
// ensure capacity