You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/12/09 14:35:54 UTC

svn commit: r1212408 - /camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java

Author: davsclaus
Date: Fri Dec  9 13:35:53 2011
New Revision: 1212408

URL: http://svn.apache.org/viewvc?rev=1212408&view=rev
Log:
CAMEL-4760: Spring DSL. Improved error handler XML namespace parser to only accept logName and level options for the logging error handler.

Modified:
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java?rev=1212408&r1=1212407&r2=1212408&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java Fri Dec  9 13:35:53 2011
@@ -150,6 +150,16 @@ public class ErrorHandlerDefinitionParse
             throw new IllegalArgumentException("Attribute executorServiceRef is not supported by error handler type: "
                     + type.name() + ", in error handler with id: " + id);
         }
+        String logName = element.getAttribute("logName");
+        if (ObjectHelper.isNotEmpty(logName) && (!type.equals(ErrorHandlerType.LoggingErrorHandler))) {
+            throw new IllegalArgumentException("Attribute logName is not supported by error handler type: "
+                    + type.name() + ", in error handler with id: " + id);
+        }
+        String level = element.getAttribute("level");
+        if (ObjectHelper.isNotEmpty(level) && (!type.equals(ErrorHandlerType.LoggingErrorHandler))) {
+            throw new IllegalArgumentException("Attribute level is not supported by error handler type: "
+                    + type.name() + ", in error handler with id: " + id);
+        }
     }
 
     private void parserRefAttribute(Element element, String attributeName, String propertyName, BeanDefinitionBuilder builder) {