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 2006/07/24 14:49:07 UTC
svn commit: r425031 - in
/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state:
SessionItemStateManager.java TransientChangeLog.java
TransientItemStateManager.java
Author: mreutegg
Date: Mon Jul 24 05:49:07 2006
New Revision: 425031
URL: http://svn.apache.org/viewvc?rev=425031&view=rev
Log:
Simplify check for entries in attic
Modified:
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientChangeLog.java
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java?rev=425031&r1=425030&r2=425031&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java Mon Jul 24 05:49:07 2006
@@ -561,7 +561,7 @@
*/
private Iterator getDescendantTransientItemStatesInAttic(NodeId parentId) {
// DIFF JACKRABBIT: if (!transientStateMgr.hasAnyItemStatesInAttic()) {
- if (transientStateMgr.getEntriesInAtticCount() == 0) {
+ if (!transientStateMgr.hasEntriesInAttic()) {
return Collections.EMPTY_LIST.iterator();
}
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientChangeLog.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientChangeLog.java?rev=425031&r1=425030&r2=425031&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientChangeLog.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientChangeLog.java Mon Jul 24 05:49:07 2006
@@ -100,8 +100,8 @@
/**
* @inheritDoc
*/
- public int getEntriesInAtticCount() {
- return deletedStates.size();
+ public boolean hasEntriesInAttic() {
+ return deletedStates.size() > 0;
}
/**
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java?rev=425031&r1=425030&r2=425031&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java Mon Jul 24 05:49:07 2006
@@ -33,9 +33,9 @@
public int getEntriesCount();
/**
- * @return the number of entries in attic
+ * @return <code>true</code> if there are any entries in attic.
*/
- public int getEntriesInAtticCount();
+ public boolean hasEntriesInAttic();
/**
* @return an iterator over all entries