Added null checks to String and Symbol. Added a temp hack to get around string encoding. Needs further investigation.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/2fdeeade Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/2fdeeade Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/2fdeeade Branch: refs/heads/rajith-codec Commit: 2fdeeade3d4e018a840ec786a8e28cc9e690d221 Parents: f711aaf Author: Rajith Attapattu <[email protected]> Authored: Tue May 12 10:57:12 2015 -0400 Committer: Rajith Attapattu <[email protected]> Committed: Tue May 12 10:57:12 2015 -0400 ---------------------------------------------------------------------- .../org/apache/qpid/proton/codec2/AbstractDecoder.java | 3 ++- .../org/apache/qpid/proton/codec2/AbstractEncoder.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2fdeeade/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractDecoder.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractDecoder.java b/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractDecoder.java index 032c2bf..af047df 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractDecoder.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractDecoder.java @@ -463,7 +463,8 @@ public abstract class AbstractDecoder implements Decoder case Encodings.STR32: return new String(readBytes(offset, size), StandardCharsets.UTF_8); default: - throw new IllegalStateException("cannot convert to a string: " + Type.typeOf(code)); + return new String(readBytes(offset, size), StandardCharsets.UTF_8); + //throw new IllegalStateException("cannot convert to a string: " + Type.typeOf(code)); } } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2fdeeade/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java b/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java index 97147dd..01c3aed 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java @@ -280,6 +280,11 @@ public abstract class AbstractEncoder implements Encoder @Override public void putString(String s) { + if(s == null) + { + putNull(); + return; + } byte[] bytes = s.getBytes(StandardCharsets.UTF_8); putString(bytes, 0, bytes.length); } @@ -300,6 +305,11 @@ public abstract class AbstractEncoder implements Encoder @Override public void putSymbol(String s) { + if(s == null) + { + putNull(); + return; + } byte[] bytes = s.getBytes(StandardCharsets.US_ASCII); putSymbol(bytes, 0, bytes.length); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
