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 8CA2F8646 for ; Fri, 12 Aug 2011 16:24:27 +0000 (UTC) Received: (qmail 74119 invoked by uid 500); 12 Aug 2011 16:24:27 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 74064 invoked by uid 500); 12 Aug 2011 16:24:26 -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 74057 invoked by uid 99); 12 Aug 2011 16:24:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Aug 2011 16:24:26 +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; Fri, 12 Aug 2011 16:24:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 64BE723889DA; Fri, 12 Aug 2011 16:24:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157176 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java Date: Fri, 12 Aug 2011 16:24:04 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110812162404.64BE723889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Fri Aug 12 16:24:04 2011 New Revision: 1157176 URL: http://svn.apache.org/viewvc?rev=1157176&view=rev Log: minor improvement Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java?rev=1157176&r1=1157175&r2=1157176&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java Fri Aug 12 16:24:04 2011 @@ -1171,6 +1171,7 @@ public class WorkspaceManager } public void run() { + String wspName = sessionInfo.getWorkspaceName(); while (!Thread.interrupted() && !disposeChangeFeed) { try { InternalEventListener[] iel; @@ -1179,15 +1180,13 @@ public class WorkspaceManager while (subscription == null) { listeners.wait(); } - iel = listeners.toArray(new InternalEventListener[0]); + iel = listeners.toArray(new InternalEventListener[listeners.size()]); subscr = subscription; } - log.debug("calling getEvents() (Workspace={})", - sessionInfo.getWorkspaceName()); + log.debug("calling getEvents() (Workspace={})", wspName); EventBundle[] bundles = service.getEvents(subscr, pollTimeout); - log.debug("returned from getEvents() (Workspace={})", - sessionInfo.getWorkspaceName()); + log.debug("returned from getEvents() (Workspace={})", wspName); // check if thread had been interrupted while // getting events if (Thread.interrupted() || disposeChangeFeed) { @@ -1202,8 +1201,7 @@ public class WorkspaceManager // terminate break; } catch (RepositoryException e) { - log.info("Workspace=" + sessionInfo.getWorkspaceName() + - ": Exception while retrieving event bundles: " + e); + log.info("Workspace=" + wspName + ": Exception while retrieving event bundles: " + e); log.debug("Dump:", e); } catch (InterruptedException e) { // terminate @@ -1212,5 +1210,4 @@ public class WorkspaceManager } } } - }