Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 92A9E99C5 for ; Thu, 29 Sep 2011 15:51:49 +0000 (UTC) Received: (qmail 30516 invoked by uid 500); 29 Sep 2011 15:51:49 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 30463 invoked by uid 500); 29 Sep 2011 15:51:49 -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 30452 invoked by uid 99); 29 Sep 2011 15:51:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Sep 2011 15:51:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 29 Sep 2011 15:51:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 98363238888F; Thu, 29 Sep 2011 15:51:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1177340 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Date: Thu, 29 Sep 2011 15:51:27 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110929155127.98363238888F@eris.apache.org> Author: reschke Date: Thu Sep 29 15:51:27 2011 New Revision: 1177340 URL: http://svn.apache.org/viewvc?rev=1177340&view=rev Log: JCR-3086: fix potential infinite loop around InternalVersionImpl.getSuccessors Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java?rev=1177340&r1=1177339&r2=1177340&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Thu Sep 29 15:51:27 2011 @@ -111,6 +111,7 @@ class InternalVersionHistoryImpl extends throws RepositoryException { super(vMgr, node); init(); + fixLegacy(); } /** @@ -160,8 +161,11 @@ class InternalVersionHistoryImpl extends } nameCache.put(child.getName(), child.getId()); } + } + - // fix legacy + // fix legacy + private void fixLegacy() throws RepositoryException { if (rootVersion.getSuccessors().isEmpty()) { for (Name versionName : nameCache.keySet()) { InternalVersionImpl v = createVersionInstance(versionName);