You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2017/07/28 08:54:10 UTC
camel git commit: Revert "CAMEL-11609:thread-safety if headers get
modified on the fly"
Repository: camel
Updated Branches:
refs/heads/master 27d6c83ec -> 8781be036
Revert "CAMEL-11609:thread-safety if headers get modified on the fly"
This reverts commit 27d6c83ecd392168e59971f5de8e4ad258a1f461.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8781be03
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8781be03
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8781be03
Branch: refs/heads/master
Commit: 8781be03625ea983ec1002c7d46796f08bc65e99
Parents: 27d6c83
Author: onders86 <on...@gmail.com>
Authored: Fri Jul 28 11:53:08 2017 +0300
Committer: onders86 <on...@gmail.com>
Committed: Fri Jul 28 11:53:08 2017 +0300
----------------------------------------------------------------------
.../org/apache/camel/dataformat/univocity/Marshaller.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8781be03/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
----------------------------------------------------------------------
diff --git a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
index e170c95..5c113cb 100644
--- a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
+++ b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/Marshaller.java
@@ -46,9 +46,7 @@ final class Marshaller<W extends AbstractWriter<?>> {
*/
Marshaller(String[] headers, boolean adaptHeaders) {
if (headers != null) {
- synchronized (this.headers) {
- this.headers.addAll(Arrays.asList(headers));
- }
+ this.headers.addAll(Arrays.asList(headers));
}
this.adaptHeaders = adaptHeaders;
}
@@ -88,9 +86,7 @@ final class Marshaller<W extends AbstractWriter<?>> {
Map<?, ?> map = convertToMandatoryType(exchange, Map.class, row);
if (adaptHeaders) {
for (Object key : map.keySet()) {
- synchronized (headers) {
- headers.add(convertToMandatoryType(exchange, String.class, key));
- }
+ headers.add(convertToMandatoryType(exchange, String.class, key));
}
}