Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 35280 invoked from network); 10 Jul 2007 14:16:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jul 2007 14:16:17 -0000 Received: (qmail 45160 invoked by uid 500); 10 Jul 2007 14:16:19 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 45115 invoked by uid 500); 10 Jul 2007 14:16:19 -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 45105 invoked by uid 99); 10 Jul 2007 14:16:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jul 2007 07:16:19 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jul 2007 07:16:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A60F31A981A; Tue, 10 Jul 2007 07:15:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r554955 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java Date: Tue, 10 Jul 2007 14:15:55 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070710141555.A60F31A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Tue Jul 10 07:15:54 2007 New Revision: 554955 URL: http://svn.apache.org/viewvc?view=rev&rev=554955 Log: - Only register as internal event listener when external listeners are added. Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java?view=diff&rev=554955&r1=554954&r2=554955 ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java Tue Jul 10 07:15:54 2007 @@ -78,6 +78,12 @@ private Map readOnlySubscriptions; /** + * Indicates if this observation manager is registered as an internal event + * listener on the workspace manager. + */ + private boolean isRegistered = false; + + /** * Creates a new observation manager for session. * @param wspManager the WorkspaceManager. * @param nsResolver NamespaceResolver to be used by this observation manager @@ -88,7 +94,6 @@ this.wspManager = wspManager; this.nsResolver = nsResolver; this.ntRegistry = ntRegistry; - this.wspManager.addEventListener(this); } /** @@ -101,6 +106,10 @@ String[] uuids, String[] nodeTypeNames, boolean noLocal) throws RepositoryException { + if (!isRegistered) { + wspManager.addEventListener(this); + isRegistered = true; + } Path path; try { path = PathFormat.parse(absPath, nsResolver).getCanonicalPath();