Author: angela
Date: Thu Feb 27 13:13:32 2014
New Revision: 1572547
URL: http://svn.apache.org/r1572547
Log:
revert changes made to Workspace#move -> TCK test failing
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java?rev=1572547&r1=1572546&r2=1572547&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
Thu Feb 27 13:13:32 2014
@@ -184,25 +184,12 @@ public class WorkspaceImpl implements Ja
final String srcOakPath = getOakPathOrThrowNotFound(srcAbsPath);
final String destOakPath = getOakPathOrThrowNotFound(destAbsPath);
- sessionDelegate.perform(new SessionOperation<Object>(true) {
- @Override
- public void checkPreconditions() throws RepositoryException {
- super.checkPreconditions();
- ensureIsAlive();
- }
-
- @Override
- public Object perform() throws RepositoryException {
- sessionDelegate.checkProtectedNode(getParentPath(srcOakPath));
- sessionDelegate.checkProtectedNode(getParentPath(destOakPath));
-
- SessionImpl.checkIndexOnName(sessionContext, destAbsPath);
-
- sessionDelegate.move(srcOakPath, destOakPath, false);
- return null;
- }
- });
+ ensureIsAlive();
+ sessionDelegate.checkProtectedNode(getParentPath(srcOakPath));
+ sessionDelegate.checkProtectedNode(getParentPath(destOakPath));
+ SessionImpl.checkIndexOnName(sessionContext, destAbsPath);
+ sessionDelegate.move(srcOakPath, destOakPath, false);
}
@Override
