Repository: flume Updated Branches: refs/heads/trunk 8328bccd4 -> aa6fb7fbd
FLUME-1710. JSONEvent.getBody should not return null (Ashish Paliwal via Hari) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/aa6fb7fb Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/aa6fb7fb Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/aa6fb7fb Branch: refs/heads/trunk Commit: aa6fb7fbd9273c905a242c045f99a5b114fb3dc0 Parents: 8328bcc Author: Hari Shreedharan <[email protected]> Authored: Tue Oct 14 18:08:52 2014 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Tue Oct 14 18:08:52 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/flume/event/JSONEvent.java | 4 ++-- .../java/org/apache/flume/event/TestEventBuilder.java | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/aa6fb7fb/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java b/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java index 5c6c0d4..0ec1678 100644 --- a/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java +++ b/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java @@ -21,6 +21,7 @@ package org.apache.flume.event; import java.io.UnsupportedEncodingException; import java.util.Map; import org.apache.flume.Event; +import org.apache.flume.FlumeException; /** * @@ -46,8 +47,7 @@ public class JSONEvent implements Event{ try { return body.getBytes(charset); } catch (UnsupportedEncodingException ex) { - //Should never happen - return null; + throw new FlumeException(String.format("%s encoding not supported", charset), ex); } } else { return new byte[0]; http://git-wip-us.apache.org/repos/asf/flume/blob/aa6fb7fb/flume-ng-sdk/src/test/java/org/apache/flume/event/TestEventBuilder.java ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/src/test/java/org/apache/flume/event/TestEventBuilder.java b/flume-ng-sdk/src/test/java/org/apache/flume/event/TestEventBuilder.java index 2102770..ad88ce5 100644 --- a/flume-ng-sdk/src/test/java/org/apache/flume/event/TestEventBuilder.java +++ b/flume-ng-sdk/src/test/java/org/apache/flume/event/TestEventBuilder.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.flume.Event; +import org.apache.flume.FlumeException; import org.junit.Assert; import org.junit.Test; @@ -56,4 +57,11 @@ public class TestEventBuilder { Assert.assertEquals("e1 has a one key", "1", e1.getHeaders().get("one")); } -} + @Test (expected = FlumeException.class) + public void testJsonEventUnsupportedEncoding() { + JSONEvent jsonEvent = new JSONEvent(); + jsonEvent.setCharset("dummy"); + jsonEvent.setBody("This is json event".getBytes()); + jsonEvent.getBody(); + } +} \ No newline at end of file
