|
243 | 243 | <span class="source-line-no">230</span><span id="line-230"> case FIELD_NAME:</span> |
244 | 244 | <span class="source-line-no">231</span><span id="line-231"> break;</span> |
245 | 245 | <span class="source-line-no">232</span><span id="line-232"> default:</span> |
246 | | -<span class="source-line-no">233</span><span id="line-233"> final JsonLocation loc = parser.getTokenLocation();</span> |
| 246 | +<span class="source-line-no">233</span><span id="line-233"> final JsonLocation loc = JacksonCompat.currentTokenLocation(parser);</span> |
247 | 247 | <span class="source-line-no">234</span><span id="line-234"> throw new ParsingException(node, loc.getLineNr(), loc.getColumnNr(), parser.getText(), "Unsupported token type: " + token, null);</span> |
248 | 248 | <span class="source-line-no">235</span><span id="line-235"> }</span> |
249 | 249 | <span class="source-line-no">236</span><span id="line-236"> } catch (final StreamReadException ex) {</span> |
|
265 | 265 | <span class="source-line-no">252</span><span id="line-252"> written = true;</span> |
266 | 266 | <span class="source-line-no">253</span><span id="line-253"> }</span> |
267 | 267 | <span class="source-line-no">254</span><span id="line-254"> }</span> |
268 | | -<span class="source-line-no">255</span><span id="line-255"> throw newException(node, parser.getCurrentLocation(), null, "Reached end of stream with unclosed array!", null);</span> |
| 268 | +<span class="source-line-no">255</span><span id="line-255"> throw newException(node, JacksonCompat.currentLocation(parser), null, "Reached end of stream with unclosed array!", null);</span> |
269 | 269 | <span class="source-line-no">256</span><span id="line-256"> }</span> |
270 | 270 | <span class="source-line-no">257</span><span id="line-257"></span> |
271 | 271 | <span class="source-line-no">258</span><span id="line-258"> private static void parseObject(final JsonParser parser, final ConfigurationNode node) throws IOException {</span> |
|
278 | 278 | <span class="source-line-no">265</span><span id="line-265"> }</span> |
279 | 279 | <span class="source-line-no">266</span><span id="line-266"> return;</span> |
280 | 280 | <span class="source-line-no">267</span><span id="line-267"> } else {</span> |
281 | | -<span class="source-line-no">268</span><span id="line-268"> parseValue(parser, node.node(parser.getCurrentName()));</span> |
| 281 | +<span class="source-line-no">268</span><span id="line-268"> parseValue(parser, node.node(JacksonCompat.currentName(parser)));</span> |
282 | 282 | <span class="source-line-no">269</span><span id="line-269"> written = true;</span> |
283 | 283 | <span class="source-line-no">270</span><span id="line-270"> }</span> |
284 | 284 | <span class="source-line-no">271</span><span id="line-271"> }</span> |
285 | | -<span class="source-line-no">272</span><span id="line-272"> throw newException(node, parser.getCurrentLocation(), null, "Reached end of stream with unclosed object!", null);</span> |
| 285 | +<span class="source-line-no">272</span><span id="line-272"> throw newException(node, JacksonCompat.currentLocation(parser), null, "Reached end of stream with unclosed object!", null);</span> |
286 | 286 | <span class="source-line-no">273</span><span id="line-273"> }</span> |
287 | 287 | <span class="source-line-no">274</span><span id="line-274"></span> |
288 | 288 | <span class="source-line-no">275</span><span id="line-275"> @Override</span> |
|
0 commit comments