Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 66623 invoked from network); 25 Feb 2009 14:02:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Feb 2009 14:02:51 -0000 Received: (qmail 95538 invoked by uid 500); 25 Feb 2009 14:02:51 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 95510 invoked by uid 500); 25 Feb 2009 14:02:50 -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 95498 invoked by uid 99); 25 Feb 2009 14:02:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Feb 2009 06:02:50 -0800 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; Wed, 25 Feb 2009 14:02:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 614A7238899B; Wed, 25 Feb 2009 14:02:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r747785 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core: observation/ObservationDispatcher.java query/lucene/IndexMerger.java Date: Wed, 25 Feb 2009 14:02:21 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090225140221.614A7238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Wed Feb 25 14:02:20 2009 New Revision: 747785 URL: http://svn.apache.org/viewvc?rev=747785&view=rev Log: - fix typos Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationDispatcher.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationDispatcher.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationDispatcher.java?rev=747785&r1=747784&r2=747785&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationDispatcher.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationDispatcher.java Wed Feb 25 14:02:20 2009 @@ -83,7 +83,7 @@ /** * Creates a new ObservationDispatcher instance - * and starts the notification thread deamon. + * and starts the notification thread daemon. */ public ObservationDispatcher() { notificationThread = new Thread(this, "ObservationManager"); Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java?rev=747785&r1=747784&r2=747785&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java Wed Feb 25 14:02:20 2009 @@ -34,7 +34,7 @@ import EDU.oswego.cs.dl.util.concurrent.Mutex; /** - * Merges indexes in a separate deamon thread. + * Merges indexes in a separate daemon thread. */ class IndexMerger extends Thread implements IndexListener { @@ -234,13 +234,13 @@ try { // give the merger thread some time to quit, // it is possible that the merger is busy working on a large index. - // if that is the case we will just ignore it and the deamon will + // if that is the case we will just ignore it and the daemon will // die without being able to finish the merge. // at this point it is not possible anymore to replace indexes // on the MultiIndex because we hold the indexReplacement Sync. this.join(500); if (isAlive()) { - log.info("Unable to stop IndexMerger. Deamon is busy."); + log.info("Unable to stop IndexMerger. Daemon is busy."); } else { log.debug("IndexMerger thread stopped"); }