incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
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 GMT
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;



Mime
View raw message