You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/08/14 10:43:48 UTC
svn commit: r1372776 -
/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
Author: ningjiang
Date: Tue Aug 14 08:43:48 2012
New Revision: 1372776
URL: http://svn.apache.org/viewvc?rev=1372776&view=rev
Log:
CAMEL-5488 fixed the spring schema issue and camel-hl7 test failures
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java?rev=1372776&r1=1372775&r2=1372776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java Tue Aug 14 08:43:48 2012
@@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.DataFormat;
@@ -34,7 +35,7 @@ import org.apache.camel.spi.DataFormat;
public class HL7DataFormat extends DataFormatDefinition {
@XmlAttribute
private Boolean validate;
- @XmlAttribute
+ @XmlTransient
private Object parser;
public HL7DataFormat() {
@@ -55,16 +56,18 @@ public class HL7DataFormat extends DataF
}
public Object getParser() {
- return parser;
- }
+ return parser;
+ }
- public void setParser(Object parser) {
- this.parser = parser;
- }
+ public void setParser(Object parser) {
+ this.parser = parser;
+ }
- @Override
+ @Override
protected void configureDataFormat(DataFormat dataFormat) {
- setProperty(dataFormat, "parser", getParser());
+ if (getParser() != null) {
+ setProperty(dataFormat, "parser", getParser());
+ }
setProperty(dataFormat, "validate", isValidate());
}