You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2019/11/08 15:23:36 UTC
svn commit: r1869572 - in /jackrabbit/branches/2.16: ./
jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
Author: reschke
Date: Fri Nov 8 15:23:36 2019
New Revision: 1869572
URL: http://svn.apache.org/viewvc?rev=1869572&view=rev
Log:
JCR-4483: jcr2spi: potential NPE in ImportHandler.endDocument (merged r1867130 into 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1867130
Modified: jackrabbit/branches/2.16/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java?rev=1869572&r1=1869571&r2=1869572&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java Fri Nov 8 15:23:36 2019
@@ -162,7 +162,9 @@ public class ImportHandler extends Defau
@Override
public void endDocument() throws SAXException {
// delegate to target handler
- targetHandler.endDocument();
+ if (targetHandler != null) {
+ targetHandler.endDocument();
+ }
// cleanup
nsContext.reset();
}