You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2008/03/19 14:15:19 UTC

svn commit: r638821 - /jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/Restore.java

Author: mreutegg
Date: Wed Mar 19 06:15:16 2008
New Revision: 638821

URL: http://svn.apache.org/viewvc?rev=638821&view=rev
Log:
JCR-1476: Restore to base version throws NullPointerException
- remove workaround in test case

Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/Restore.java

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/Restore.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/Restore.java?rev=638821&r1=638820&r2=638821&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/Restore.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/Restore.java Wed Mar 19 06:15:16 2008
@@ -38,8 +38,7 @@
     public NodeIterator execute() throws Exception {
         Node n = getNode();
         Version v = getRandomVersion(false);
-        // TODO: for now only call restore on non-base versions. See: JCR-1476
-        if (v != null && !n.getBaseVersion().isSame(v)) {
+        if (v != null) {
             log.info(n.getPath() + ":" + v.getName());
             n.restore(v, true);
         }