fix NPE in Mantis6235IntegrationTest (#701)

B3Partners · Oct 3, 2019 · 78eba77 · 78eba77
1 parent f93952f
commit 78eba77
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/brmo-loader/src/main/resources/xsl/brk-snapshot-to-rsgb-xml.xsl b/brmo-loader/src/main/resources/xsl/brk-snapshot-to-rsgb-xml.xsl
@@ -173,6 +173,13 @@
                         </xsl:call-template>
                     </fk_2nnp_sc_identif>
                 </xsl:when>
+                <xsl:when test="$vve_id and ../nhr:Rechtspersoon[@id = substring($vve_id,2)]/pers:identificatie">
+                    <fk_2nnp_sc_identif>
+                        <xsl:call-template name="nen_identificatie">
+                            <xsl:with-param name="id" select="../nhr:Rechtspersoon[@id = substring($vve_id,2)]/pers:identificatie"/>
+                        </xsl:call-template>
+                    </fk_2nnp_sc_identif>
+                </xsl:when>
             </xsl:choose>
         </app_re>
     </xsl:template>

diff --git a/brmo-loader/src/test/java/nl/b3p/Mantis6235IntegrationTest.java b/brmo-loader/src/test/java/nl/b3p/Mantis6235IntegrationTest.java
@@ -91,7 +91,7 @@ public void setUp() throws Exception {
             staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory());
         }
 
-        IDataSet stagingDataSet = new XmlDataSet(new FileInputStream(new File(Mantis6166IntegrationTest.class.getResource("/mantis6235/staging.xml").toURI())));
+        IDataSet stagingDataSet = new XmlDataSet(new FileInputStream(new File(Mantis6235IntegrationTest.class.getResource("/mantis6235/staging.xml").toURI())));
 
         sequential.lock();
 
@@ -112,10 +112,9 @@ public void setUp() throws Exception {
     public void cleanup() throws Exception {
         brmo.closeBrmoFramework();
 
-        CleanUtil.cleanRSGB(rsgb);
-        rsgb.close();
-
+        CleanUtil.cleanRSGB_BRK(rsgb, true);
         CleanUtil.cleanSTAGING(staging);
+        rsgb.close();
         staging.close();
 
         sequential.unlock();