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 2009/07/06 13:49:50 UTC

svn commit: r791452 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java

Author: reschke
Date: Mon Jul  6 11:49:50 2009
New Revision: 791452

URL: http://svn.apache.org/viewvc?rev=791452&view=rev
Log:
JCR-1592: removeActivity failed with NPE when no current activity set

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java?rev=791452&r1=791451&r2=791452&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java Mon Jul  6 11:49:50 2009
@@ -251,7 +251,7 @@
         }
         NodeId actId = actNode.getNodeId();
         session.getVersionManager().removeActivity(session, actId);
-        if (currentActivity.equals(actId)) {
+        if (actId.equals(currentActivity)) {
             currentActivity = null;
         }
     }