From commits-return-11458-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Jul 12 09:51:58 2011 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 6E42067D2 for ; Tue, 12 Jul 2011 09:51:58 +0000 (UTC) Received: (qmail 23634 invoked by uid 500); 12 Jul 2011 09:51:57 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 21194 invoked by uid 500); 12 Jul 2011 09:51:43 -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 21183 invoked by uid 99); 12 Jul 2011 09:51:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jul 2011 09:51:40 +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; Tue, 12 Jul 2011 09:51:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1E58923888CF; Tue, 12 Jul 2011 09:51:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1145513 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Date: Tue, 12 Jul 2011 09:51:13 -0000 To: commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110712095113.1E58923888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: alexparvulescu Date: Tue Jul 12 09:51:12 2011 New Revision: 1145513 URL: http://svn.apache.org/viewvc?rev=1145513&view=rev Log: JCR-3019 RepositoryImpl.activeSessions should use Session instead of SessionImpl Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1145513&r1=1145512&r2=1145513&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Tue Jul 12 09:51:12 2011 @@ -206,7 +206,7 @@ public class RepositoryImpl extends Abst /** * active sessions (weak references) */ - private final Map activeSessions = + private final Map activeSessions = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK); // flag indicating if repository has been shut down @@ -1113,14 +1113,14 @@ public class RepositoryImpl extends Abst // (copy sessions to array to avoid ConcurrentModificationException; // manually copy entries rather than calling ReferenceMap#toArray() in // order to work around http://issues.apache.org/bugzilla/show_bug.cgi?id=25551) - List sa; + List sa; synchronized (activeSessions) { - sa = new ArrayList(activeSessions.size()); - for (SessionImpl session : activeSessions.values()) { + sa = new ArrayList(activeSessions.size()); + for (Session session : activeSessions.values()) { sa.add(session); } } - for (SessionImpl session : sa) { + for (Session session : sa) { if (session != null) { session.logout(); } @@ -2398,7 +2398,7 @@ public class RepositoryImpl extends Abst synchronized (activeSessions) { // remove workspaces with active sessions - for (SessionImpl ses : activeSessions.values()) { + for (Session ses : activeSessions.values()) { wspNames.remove(ses.getWorkspace().getName()); } }