Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 AB76AF1C0 for ; Sat, 6 Apr 2013 07:46:23 +0000 (UTC) Received: (qmail 13680 invoked by uid 500); 6 Apr 2013 07:46:23 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 13603 invoked by uid 500); 6 Apr 2013 07:46:23 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 13585 invoked by uid 99); 6 Apr 2013 07:46:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Apr 2013 07:46:22 +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; Sat, 06 Apr 2013 07:46:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 87EE823888E7; Sat, 6 Apr 2013 07:46:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1465207 - in /camel/branches/camel-2.10.x: ./ components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java Date: Sat, 06 Apr 2013 07:46:01 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130406074601.87EE823888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Sat Apr 6 07:46:01 2013 New Revision: 1465207 URL: http://svn.apache.org/r1465207 Log: CAMEL-6247: Dont log illegal state exception on stopping blueprint as it may happen at WARN level. Modified: camel/branches/camel-2.10.x/ (props changed) camel/branches/camel-2.10.x/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1465206 Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.10.x/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java?rev=1465207&r1=1465206&r2=1465207&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java (original) +++ camel/branches/camel-2.10.x/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java Sat Apr 6 07:46:01 2013 @@ -147,7 +147,13 @@ public final class CamelBlueprintHelper } } } catch (Exception e) { - LOG.warn("Error during disposing BundleContext. This exception will be ignored.", e); + IllegalStateException ise = ObjectHelper.getException(IllegalStateException.class, e); + if (ise != null) { + // we dont care about illegal state exception as that may happen from OSGi + LOG.debug("Error during disposing BundleContext. This exception will be ignored.", e); + } else { + LOG.warn("Error during disposing BundleContext. This exception will be ignored.", e); + } } finally { String tempDir = System.clearProperty("org.osgi.framework.storage"); if (tempDir != null) {