Follow-up to #480

Author: cowtowncoder

properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java

@@ -239,14 +239,15 @@ public JsonToken nextToken() throws IOException {
 System.err.println("\n>>");
 */
         }
-        while ((_currToken = _readContext.nextToken()) == null) {
+        JsonToken t;
+        while ((t = _readContext.nextToken()) == null) {
             _readContext = _readContext.nextContext();
             if (_readContext == null) { // end of content
-                return null;
+                return _updateTokenToNull();
             }
             streamReadConstraints().validateNestingDepth(_readContext.getNestingDepth());
         }
-        return _currToken;
+        return _updateToken(t);
     }
 
     /*