commit 8a8ca74cf6e2a47dfcbc388b6240d7835cb0b18c
author cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Tue Dec 13 16:00:36 2011 +0000
committer cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Tue Dec 13 16:00:36 2011 +0000
tree 18bafb3fd18c44bd261de7eefc5988563ba4adae
parent c3c95292c04d15ea0dc54f7264568d01fdaa00b6

Fix [JACKSON-733], problems data-binding byte[] with Smile

release-notes/VERSION

diff --git a/release-notes/VERSION b/release-notes/VERSION
index e46ad48..1c54cfd 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -16,6 +16,8 @@
   * [JACKSON-729] Add 'ObjectMapper.readValues(byte[])' convenience method
 
   Fixes:
+
+  (all fixes up to 1.8.7)
   
 ------------------------------------------------------------------------
 === History: ===

src/smile/java/org/codehaus/jackson/smile/SmileParser.java

diff --git a/src/smile/java/org/codehaus/jackson/smile/SmileParser.java b/src/smile/java/org/codehaus/jackson/smile/SmileParser.java
index 3f636fa..0f95a8a 100644
--- a/src/smile/java/org/codehaus/jackson/smile/SmileParser.java
+++ b/src/smile/java/org/codehaus/jackson/smile/SmileParser.java
@@ -1186,6 +1186,19 @@
         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