Skip to content

Commit

Permalink
MODE-1141 Corrected VersionManager.checkin(...) logic to not duplicat…
Browse files Browse the repository at this point in the history
…e versionable nodes in history

As noted in the JIRA issue, the JcrVersionManager.checkin(...) method calls the versionNodeAt(...) recursive method, which copies the versionable state into the new version in version history. This method should *not* be walking children when the child is 'mix:versionable' and has an OPV on the child node definition of VERSION.

This change simply implements this behavior by returning from the method rather than breaking (the children are walked after the break).

All unit and integration tests pass with this minor change.
  • Loading branch information
rhauch committed Apr 7, 2011
1 parent 2170fa3 commit 459dbc0
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ private void versionNodeAt( AbstractJcrNode node,
.with(JcrLexicon.CHILD_VERSION_HISTORY, historyUuid)
.and();

break;
return;
}

// Otherwise, treat it as a copy, as per 8.2.11.2 in the 1.0.1 Spec
Expand Down

0 comments on commit 459dbc0

Please sign in to comment.