You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/08/18 21:27:15 UTC
[1/2] incubator-streams git commit: resolves STREAMS-347
Repository: incubator-streams
Updated Branches:
refs/heads/master 244dabd74 -> 288a68b0e
resolves STREAMS-347
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/eb3845c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/eb3845c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/eb3845c2
Branch: refs/heads/master
Commit: eb3845c23667a8d997fb591cfa79e71a728cb3b1
Parents: 6683683
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Sun Jul 26 13:18:42 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Sun Jul 26 13:18:42 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/eb3845c2/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java
index 570c1a2..33598c2 100644
--- a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java
+++ b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java
@@ -271,7 +271,10 @@ public class WebHdfsPersistWriter implements StreamsPersistWriter, Flushable, Cl
String documentJson = null;
try {
- documentJson = mapper.writeValueAsString(entry.getDocument());
+ if( entry.getDocument() instanceof String )
+ documentJson = (String)entry.getDocument();
+ else
+ documentJson = mapper.writeValueAsString(entry.getDocument());
} catch (JsonProcessingException e) {
LOGGER.warn("Error converting document to string", e);
}
[2/2] incubator-streams git commit: Merge branch 'STREAMS-347'
Posted by sb...@apache.org.
Merge branch 'STREAMS-347'
* STREAMS-347:
resolves STREAMS-347
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/288a68b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/288a68b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/288a68b0
Branch: refs/heads/master
Commit: 288a68b0ea2cd8625e1d81284be1e46fc0d4353c
Parents: 244dabd eb3845c
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Aug 18 14:26:58 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Aug 18 14:26:58 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------