Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-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 2B527ECF1 for ; Fri, 14 Dec 2012 16:23:01 +0000 (UTC) Received: (qmail 99890 invoked by uid 500); 14 Dec 2012 16:23:01 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 99865 invoked by uid 500); 14 Dec 2012 16:23:01 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 99855 invoked by uid 99); 14 Dec 2012 16:23:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2012 16:23:00 +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, 14 Dec 2012 16:22:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C6DC42388B75; Fri, 14 Dec 2012 16:22:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1421960 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Date: Fri, 14 Dec 2012 16:22:38 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121214162239.C6DC42388B75@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Fri Dec 14 16:22:37 2012 New Revision: 1421960 URL: http://svn.apache.org/viewvc?rev=1421960&view=rev Log: Fix minor typo Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1421960&r1=1421959&r2=1421960&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Fri Dec 14 16:22:37 2012 @@ -2007,7 +2007,7 @@ public class Felix extends BundleImpl im { // CONCURRENCY NOTE: // We will first acquire the bundle lock for the specific bundle - // as long as the bundle is STARTING or ACTIVE, shich is necessary + // as long as the bundle is STARTING or ACTIVE, which is necessary // because we may change the bundle state. // Acquire bundle lock.