[jackson-dataformat-smile] 09/31: Merge fix for [JACKSON-733] from svn

Hilko Bengen bengen at alioth.debian.org
Mon Sep 2 17:37:21 UTC 2013


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag jackson-dataformat-smile-2.0.0
in repository jackson-dataformat-smile.

commit 1a6b60f159905a25b03047742ff9680103e8c521
Author: Tatu <tatu at ning.com>
Date:   Tue Dec 13 07:56:11 2011 -0800

    Merge fix for [JACKSON-733] from svn
---
 .../fasterxml/jackson/dataformat/smile/SmileParser.java  |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
index 5e495fd..a612d41 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
@@ -1186,6 +1186,20 @@ public class SmileParser
         return _binaryValue;
     }
 
+    @Override
+    public Object getEmbeddedObject()
+        throws IOException, JsonParseException
+    {
+        if (_tokenIncomplete) {
+            _finishToken();
+        }
+        if (_currToken == JsonToken.VALUE_EMBEDDED_OBJECT ) {
+            return _binaryValue;
+        }
+        return super.getEmbeddedObject();
+    }
+    
+    
     /* NOTE: must still implement just because 1.9.0 - 1.9.2 did require
      * its implementation (and we'll try to avoid introducing binary
      * incompatibilities); however, should be deleted from 2.0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-smile.git



More information about the pkg-java-commits mailing list