svn commit: r1125208 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: builder/ErrorHandlerBuilderSupport.java processor/ErrorHandlerSupport.java

[hadrian]

Author: hadrian
Date: Fri May 20 02:45:33 2011
New Revision: 1125208

URL: http://svn.apache.org/viewvc?rev=1125208&view=rev
Log:
CAMEL-3931. Remove unnecessary creation of exception policies

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java?rev=1125208&r1=1125207&r2=1125208&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
 Fri May 20 02:45:33 2011
@@ -23,6 +23,7 @@ import org.apache.camel.model.OnExceptio
 import org.apache.camel.processor.ErrorHandler;
 import org.apache.camel.processor.ErrorHandlerSupport;
 import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
+import org.apache.camel.util.ObjectHelper;
 
 /**
  * Base class for builders of error handling.
@@ -31,7 +32,7 @@ import org.apache.camel.processor.except
  */
 public abstract class ErrorHandlerBuilderSupport implements 
ErrorHandlerBuilder {
     private List<OnExceptionDefinition> exceptions = new 
ArrayList<OnExceptionDefinition>();
-    private ExceptionPolicyStrategy exceptionPolicyStrategy = 
ErrorHandlerSupport.createDefaultExceptionPolicyStrategy();
+    private ExceptionPolicyStrategy exceptionPolicyStrategy; // = 
ErrorHandlerSupport.createDefaultExceptionPolicyStrategy();
 
     public void addErrorHandlers(OnExceptionDefinition exception) {
         // only add if we not already have it
@@ -72,6 +73,7 @@ public abstract class ErrorHandlerBuilde
     }
 
     public void setExceptionPolicyStrategy(ExceptionPolicyStrategy 
exceptionPolicyStrategy) {
+        ObjectHelper.notNull(exceptionPolicyStrategy, 
"ExceptionPolicyStrategy");
         this.exceptionPolicyStrategy = exceptionPolicyStrategy;
     }
 }

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java?rev=1125208&r1=1125207&r2=1125208&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
 Fri May 20 02:45:33 2011
@@ -93,7 +93,9 @@ public abstract class ErrorHandlerSuppor
      * for handling thrown exceptions.
      */
     public void setExceptionPolicy(ExceptionPolicyStrategy exceptionPolicy) {
-        this.exceptionPolicy = exceptionPolicy;
+        if (exceptionPolicy != null) {
+            this.exceptionPolicy = exceptionPolicy;
+        }
     }
 
     /**