You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by da...@apache.org on 2015/11/30 22:06:59 UTC
[53/98] [abbrv] incubator-apex-malhar git commit: MLHR-1870 fixed
test case for json parser
MLHR-1870 fixed test case for json parser
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/38c89529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/38c89529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/38c89529
Branch: refs/heads/master
Commit: 38c895292e4ecbbd2d763c96ed6f83665496d042
Parents: 3f4fe18
Author: shubham <sh...@github.com>
Authored: Wed Oct 14 17:39:44 2015 +0530
Committer: shubham <sh...@github.com>
Committed: Wed Oct 14 18:01:01 2015 +0530
----------------------------------------------------------------------
.../com/datatorrent/contrib/schema/parser/JsonParser.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/38c89529/contrib/src/main/java/com/datatorrent/contrib/schema/parser/JsonParser.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/schema/parser/JsonParser.java b/contrib/src/main/java/com/datatorrent/contrib/schema/parser/JsonParser.java
index db45b33..d01e436 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/schema/parser/JsonParser.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/schema/parser/JsonParser.java
@@ -28,6 +28,7 @@ import org.codehaus.jackson.map.ObjectReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.classification.InterfaceStability;
import com.datatorrent.api.Context;
@@ -73,9 +74,11 @@ public class JsonParser extends Parser<String>
public Object convert(String tuple)
{
try {
- return reader.readValue(tuple);
+ if (!StringUtils.isEmpty(tuple)) {
+ return reader.readValue(tuple);
+ }
} catch (JsonProcessingException e) {
- logger.debug("Error while converting tuple {} {}",tuple,e.getMessage());
+ logger.debug("Error while converting tuple {} {}", tuple, e.getMessage());
} catch (IOException e) {
DTThrowable.rethrow(e);
}