Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 85842 invoked from network); 5 Feb 2010 12:20:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Feb 2010 12:20:56 -0000 Received: (qmail 39707 invoked by uid 500); 5 Feb 2010 12:20:56 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 39652 invoked by uid 500); 5 Feb 2010 12:20:56 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 39643 invoked by uid 99); 5 Feb 2010 12:20:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Feb 2010 12:20:56 +0000 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; Fri, 05 Feb 2010 12:20:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1CE1B23889FA; Fri, 5 Feb 2010 12:20:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r906916 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Date: Fri, 05 Feb 2010 12:20:35 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100205122035.1CE1B23889FA@eris.apache.org> Author: cziegeler Date: Fri Feb 5 12:20:34 2010 New Revision: 906916 URL: http://svn.apache.org/viewvc?rev=906916&view=rev Log: SLING-1353 : Move web console instantiation into separate try/catch block Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java?rev=906916&r1=906915&r2=906916&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java (original) +++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Fri Feb 5 12:20:34 2010 @@ -380,7 +380,6 @@ // set up the map entries from configuration try { mapEntries = new MapEntries(this, getRepository()); - plugin = new JcrResourceResolverWebConsolePlugin(componentContext.getBundleContext(), this); } catch (Exception e) { log.error( "activate: Cannot access repository, failed setting up Mapping Support", @@ -395,6 +394,14 @@ "activate: Cannot create resource listener; resource events for JCR resources will be disabled.", e); } + + try { + plugin = new JcrResourceResolverWebConsolePlugin(componentContext.getBundleContext(), this); + } catch (Throwable ignore) { + // an exception here propably means the web console plugin is not available + log.debug( + "activate: unable to setup web console plugin.", ignore); + } } private JcrResourceResolverWebConsolePlugin plugin;