svn commit: r813834 - /camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java

[davsclaus]

Author: davsclaus
Date: Fri Sep 11 14:00:54 2009
New Revision: 813834

URL: http://svn.apache.org/viewvc?rev=813834&view=rev
Log:
Fixed a potential NPE

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java?rev=813834&r1=813833&r2=813834&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
 Fri Sep 11 14:00:54 2009
@@ -172,11 +172,14 @@
     private InterceptStrategy getOrCreateTracer() {
         InterceptStrategy tracer = Tracer.getTracer(camelContext);
         if (tracer == null) {
-            // lookup in registry
-            Map<String, Tracer> map = 
camelContext.getRegistry().lookupByType(Tracer.class);
-            if (map.size() == 1) {
-                tracer = map.values().iterator().next();
-            } else {
+            if (camelContext.getRegistry() != null) {
+                // lookup in registry
+                Map<String, Tracer> map = 
camelContext.getRegistry().lookupByType(Tracer.class);
+                if (map.size() == 1) {
+                    tracer = map.values().iterator().next();
+                }
+            }
+            if (tracer == null) {
                 // fallback to use the default tracer
                 tracer = camelContext.getDefaultTracer();
             }