Author: davsclaus
Date: Sun Dec 7 03:43:13 2008
New Revision: 724123
URL: http://svn.apache.org/viewvc?rev=724123&view=rev
Log:
Merged revisions 724122 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r724122 | davsclaus | 2008-12-07 12:32:21 +0100 (so, 07 dec 2008) | 1 line
CAMEL-1152: SetHeader requires the headerName attribute to be set with a non
empty value
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 7 03:43:13 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java?rev=724123&r1=724122&r2=724123&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
Sun Dec 7 03:43:13 2008
@@ -27,6 +27,7 @@
import org.apache.camel.builder.ProcessorBuilder;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <setHeader/> element
@@ -34,7 +35,7 @@
@XmlRootElement(name = "setHeader")
@XmlAccessorType(XmlAccessType.FIELD)
public class SetHeaderType extends ExpressionNode {
- @XmlAttribute
+ @XmlAttribute(required = true)
private String headerName;
public SetHeaderType() {
@@ -67,6 +68,7 @@
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
+ ObjectHelper.notEmpty(headerName, "headerName");
Expression expr = getExpression().createExpression(routeContext);
return ProcessorBuilder.setHeader(getHeaderName(), expr);
}
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=724123&r1=724122&r2=724123&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Sun Dec 7 03:43:13 2008
@@ -158,6 +158,12 @@
}
}
+ public static void notEmpty(String value, String name) {
+ if (isNullOrBlank(value)) {
+ throw new IllegalArgumentException(name + " must be specified and
not empty");
+ }
+ }
+
public static String[] splitOnCharacter(String value, String needle, int
count) {
String rc[] = new String[count];
rc[0] = value;
