Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 63564 invoked from network); 10 Jul 2009 12:22:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jul 2009 12:22:01 -0000 Received: (qmail 42299 invoked by uid 500); 10 Jul 2009 12:22:11 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 42222 invoked by uid 500); 10 Jul 2009 12:22:11 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 42199 invoked by uid 99); 10 Jul 2009 12:22:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2009 12:22:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2009 12:22:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D690C238887A; Fri, 10 Jul 2009 12:21:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r792912 - /jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/VersionOperation.java Date: Fri, 10 Jul 2009 12:21:48 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090710122148.D690C238887A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Fri Jul 10 12:21:48 2009 New Revision: 792912 URL: http://svn.apache.org/viewvc?rev=792912&view=rev Log: make sure base version is not removed Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/VersionOperation.java Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/VersionOperation.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/VersionOperation.java?rev=792912&r1=792911&r2=792912&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/VersionOperation.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/random/operation/VersionOperation.java Fri Jul 10 12:21:48 2009 @@ -18,6 +18,7 @@ import javax.jcr.Session; import javax.jcr.RepositoryException; +import javax.jcr.Node; import javax.jcr.version.VersionIterator; import javax.jcr.version.Version; import java.util.List; @@ -43,8 +44,15 @@ */ protected Version getRandomVersion(boolean excludeReferenced) throws RepositoryException { List allVersions = new ArrayList(); - for (VersionIterator it = getNode().getVersionHistory().getAllVersions(); it.hasNext(); ) { + Node n = getNode(); + for (VersionIterator it = n.getVersionHistory().getAllVersions(); it.hasNext(); ) { Version v = it.nextVersion(); + if (excludeReferenced) { + // quick check if it is the base version + if (n.getBaseVersion().isSame(v)) { + continue; + } + } if (v.getPredecessors().length > 0) { if (!excludeReferenced || !v.getReferences().hasNext()) { allVersions.add(v);