Merge pull request #1295 from libetl/bugfix/externalTypeId1288

#1288 applying JACKSON-831 on the BuilderBasedDeserializer

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java

@@ -662,11 +662,16 @@ protected Object deserializeWithExternalTypeId(JsonParser p,
     {
         final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
         final ExternalTypeHandler ext = _externalTypeIdHandler.start();
-        for (; p.getCurrentToken() != JsonToken.END_OBJECT; p.nextToken()) {
+        
+        for (JsonToken t = p.getCurrentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) {
             String propName = p.getCurrentName();
-            p.nextToken();
+            t = p.nextToken();
             SettableBeanProperty prop = _beanProperties.find(propName);
             if (prop != null) { // normal case
+                // [JACKSON-831]: may have property AND be used as external type id:
+                if (t.isScalarValue()) {
+                    ext.handleTypePropertyValue(p, ctxt, propName, bean);
+                }
                 if (activeView != null && !prop.visibleInView(activeView)) {
                     p.skipChildren();
                     continue;