Updated Branches: refs/heads/camel-2.11.x 3843f0022 -> ecd725de1
CAMEL-6630: Validation using JAXB format is not thread safe Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ecd725de Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ecd725de Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ecd725de Branch: refs/heads/camel-2.11.x Commit: ecd725de1e4ca085512f442c27796dac4cc79288 Parents: 3843f00 Author: cmueller <cmuel...@apache.org> Authored: Sat Aug 24 22:36:07 2013 +0200 Committer: cmueller <cmuel...@apache.org> Committed: Sat Aug 24 22:39:40 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/converter/jaxb/JaxbDataFormat.java | 2 +- .../jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ecd725de/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java index a757b90..a64d73d 100644 --- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java +++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java @@ -225,7 +225,7 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, CamelC return schemaFactory; } - public void setSchema(SchemaFactory schemaFactory) { + public void setSchemaFactory(SchemaFactory schemaFactory) { this.schemaFactory = schemaFactory; } http://git-wip-us.apache.org/repos/asf/camel/blob/ecd725de/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java index 15ea750..50d77b5 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/ConcurrentJaxbDataFormatSchemaValidationTest.java @@ -55,7 +55,7 @@ public class ConcurrentJaxbDataFormatSchemaValidationTest extends CamelTestSuppo } assertMockEndpointsSatisfied(); - log.info("Validation of {} messages took {} ms",testCount, (System.currentTimeMillis() - start)); + log.info("Validation of {} messages took {} ms", testCount, System.currentTimeMillis() - start); String payload = mockMarshall.getExchanges().get(0).getIn().getBody(String.class); log.info(payload); @@ -92,7 +92,7 @@ public class ConcurrentJaxbDataFormatSchemaValidationTest extends CamelTestSuppo } assertMockEndpointsSatisfied(20, TimeUnit.SECONDS); - log.info("Validation of {} messages took {} ms",testCount, (System.currentTimeMillis() - start)); + log.info("Validation of {} messages took {} ms", testCount, System.currentTimeMillis() - start); Person person = mockUnmarshall.getExchanges().get(0).getIn().getBody(Person.class);