commit 8244a56981bf09ecf518994f705671d959404666
author Tatu Saloranta <tatu.saloranta@iki.fi> Fri Mar 11 17:13:17 2016 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> Fri Mar 11 17:13:17 2016 -0800
tree 28b5188cd04a4cfa13d7a0eddc46c85f434f5209
parent f55df17dd367898d5366d858878f786ff4f797d8
parent c32637998fc3f1a04345d2334596eb594c905c26

Merge branch '2.7'

src/main/java/com/fasterxml/jackson/core/base/ParserBase.java

diff --git a/src/main/java/com/fasterxml/jackson/core/base/ParserBase.java b/src/main/java/com/fasterxml/jackson/core/base/ParserBase.java
index a6f53e0..df5e5a0 100644
--- a/src/main/java/com/fasterxml/jackson/core/base/ParserBase.java
+++ b/src/main/java/com/fasterxml/jackson/core/base/ParserBase.java
@@ -387,8 +387,10 @@
     @Override public String getCurrentName() throws IOException {
         // [JACKSON-395]: start markers require information from parent
         if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
-            JsonReadContext parent = _parsingContext.clearAndGetParent();
-            return parent.getCurrentName();
+            JsonReadContext parent = _parsingContext.getParent();
+            if (parent != null) {
+                return parent.getCurrentName();
+            }
         }
         return _parsingContext.getCurrentName();
     }