Merge pull request #106 from marsqing/master

cowtowncoder · web-flow · commit b8c02d04c50a · 2017-08-25T10:34:48.000-07:00
fix calling _skipUnknownValue() twice
diff --git a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java
@@ -923,7 +923,6 @@ private JsonToken _skipUnknownField(int tag, int wireType) throws IOException
             // Note: may be null; if so, value needs to be skipped
             _currentField = _currentMessage.field(tag >> 3);
             if (_currentField == null) {
-                _skipUnknownValue(wireType);
                 continue;
             }
             _parsingContext.setCurrentName(_currentField.name);

Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,6 @@ private JsonToken _skipUnknownField(int tag, int wireType) throws IOException`
`923`	`923`	`// Note: may be null; if so, value needs to be skipped`
`924`	`924`	`_currentField = _currentMessage.field(tag >> 3);`
`925`	`925`	`if (_currentField == null) {`
`926`		`- _skipUnknownValue(wireType);`
`927`	`926`	`continue;`
`928`	`927`	`}`
`929`	`928`	`_parsingContext.setCurrentName(_currentField.name);`