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 2016/08/20 08:56:33 UTC
[3/3] camel git commit: socket write should be thread safe
socket write should be thread safe
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/919a5eac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/919a5eac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/919a5eac
Branch: refs/heads/master
Commit: 919a5eac89205e635b3faf135d0217b1bfa261ad
Parents: 58eb04a
Author: Preben Asmussen <pr...@gmail.com>
Authored: Fri Aug 19 19:41:19 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Aug 20 10:21:28 2016 +0200
----------------------------------------------------------------------
.../apache/camel/component/splunk/support/SplunkDataWriter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/919a5eac/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java
----------------------------------------------------------------------
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java
index ee1a349..5650460 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java
@@ -21,6 +21,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.Socket;
+import java.nio.charset.StandardCharsets;
import com.splunk.Args;
import com.splunk.Service;
@@ -53,10 +54,10 @@ public abstract class SplunkDataWriter implements DataWriter {
doWrite(event + SplunkEvent.LINEBREAK);
}
- protected void doWrite(String event) throws IOException {
+ protected synchronized void doWrite(String event) throws IOException {
LOG.debug("writing event to splunk:" + event);
OutputStream ostream = socket.getOutputStream();
- Writer writer = new OutputStreamWriter(ostream, "UTF-8");
+ Writer writer = new OutputStreamWriter(ostream, StandardCharsets.UTF_8);
writer.write(event);
writer.flush();
}