trivial simplification

FasterXML · Dec 10, 2014 · e78d39d · e78d39d
1 parent 2ef09f8
commit e78d39d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -674,14 +674,14 @@ protected Object deserializeWithExternalTypeId(JsonParser p, DeserializationCont
     {
         final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
         final ExternalTypeHandler ext = _externalTypeIdHandler.start();
-        JsonToken t = p.getCurrentToken();
-        for (; t == JsonToken.FIELD_NAME; t = 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 (p.getCurrentToken().isScalarValue()) {
+                if (t.isScalarValue()) {
                     ext.handleTypePropertyValue(p, ctxt, propName, bean);
                 }
                 if (activeView != null && !prop.visibleInView(activeView)) {

diff --git a/src/test/java/com/fasterxml/jackson/failing/JSOGDeserialize622Test.java b/src/test/java/com/fasterxml/jackson/failing/JSOGDeserialize622Test.java
@@ -114,8 +114,8 @@ public JSOGRef(int val) {
    */
   @JsonIdentityInfo(generator=JSOGGenerator.class)
   public static class IdentifiableExampleJSOG {
-    public int foo;
-    public IdentifiableExampleJSOG next;
+      public int foo;
+      public IdentifiableExampleJSOG next;
   }
 
   /*
@@ -126,14 +126,13 @@ public static class IdentifiableExampleJSOG {
 
   // for [databind#622]
   public void testStructJSOGRef() throws Exception {
-
-    // Because the value ({@ref:1}) is not scalar, parser thinks it is not an id 
-    // and tries to deserialize as normal a new IdentifiableExampleJSOG 
-    // then  complains about unrecognized field "@ref"
-    IdentifiableExampleJSOG result = mapper.readValue(EXP_EXAMPLE_JSOG,
-            IdentifiableExampleJSOG.class);
-
-    assertEquals(66, result.foo);
-    assertSame(result, result.next);
+      // Because the value ({@ref:1}) is not scalar, parser thinks it is not an id 
+      // and tries to deserialize as normal a new IdentifiableExampleJSOG 
+      // then  complains about unrecognized field "@ref"
+      IdentifiableExampleJSOG result = mapper.readValue(EXP_EXAMPLE_JSOG,
+              IdentifiableExampleJSOG.class);
+
+      assertEquals(66, result.foo);
+      assertSame(result, result.next);
   }
 }