You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2011/10/05 18:27:27 UTC
svn commit: r1179305 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Author: reschke
Date: Wed Oct 5 16:27:27 2011
New Revision: 1179305
URL: http://svn.apache.org/viewvc?rev=1179305&view=rev
Log:
typos
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=1179305&r1=1179304&r2=1179305&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Wed Oct 5 16:27:27 2011
@@ -1323,7 +1323,7 @@ public class SharedItemStateManager
} else if (!parentId.equals(oldParentId)) {
- // This node has been moved, check whether the parent has been modified aswell
+ // This node has been moved, check whether the parent has been modified as well
if (changeLog.has(parentId)) {
checkParent(changeLog, modifiedNodeState, parentId);
} else if (!isShareable(modifiedNodeState)) {
@@ -1335,7 +1335,7 @@ public class SharedItemStateManager
// The old parent must be modified or deleted
if (!changeLog.isModified(oldParentId) && !changeLog.deleted(oldParentId)) {
String message = "Node with id " + id
- + " has been move, but the original parent is not part of the changelog: "
+ + " has been moved, but the original parent is not part of the changelog: "
+ oldParentId;
log.error(message);
throw new ItemStateException(message);
@@ -1441,7 +1441,7 @@ public class SharedItemStateManager
* if an error occurs
*/
private boolean isShareable(NodeState state) throws RepositoryException {
- // shortcut: check some wellknown built-in types first
+ // shortcut: check some well-known built-in types first
Name primary = state.getNodeTypeName();
Set<Name> mixins = state.getMixinTypeNames();
if (mixins.contains(NameConstants.MIX_SHAREABLE)) {