litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2108 code correction for nullpointer exception in naming blank nodes method.

Browse source
This commit is contained in:
ass92 2011-02-10 22:03:05 +00:00
parent a837d62ae8
commit 9b13425258
1 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

68
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
View file

@ -762,48 +762,50 @@ public class JenaIngestController extends BaseEditController {
else{ else{
destination.add(utils.renameBNodesByPattern(source, namespaceEtc, vreq.getJenaOntModel(), pattern, property)); destination.add(utils.renameBNodesByPattern(source, namespaceEtc, vreq.getJenaOntModel(), pattern, property));
} }
if(csv2rdf && property!=null){ if(csv2rdf!=null){
ClosableIterator closeIt = destination.listSubjects(); if(csv2rdf && property!=null){
Property prop = ResourceFactory.createProperty(property); ClosableIterator closeIt = destination.listSubjects();
try { Property prop = ResourceFactory.createProperty(property);
for (Iterator it = closeIt; it.hasNext();) { try {
Resource res = (Resource) it.next(); for (Iterator it = closeIt; it.hasNext();) {
if (res.isAnon()) { Resource res = (Resource) it.next();
ClosableIterator closfIt = destination.listStatements(res,prop,(RDFNode)null); if (res.isAnon()) {
Statement stmt = null; ClosableIterator closfIt = destination.listStatements(res,prop,(RDFNode)null);
try { Statement stmt = null;
if (closfIt.hasNext()) { try {
stmt = (Statement) closfIt.next(); if (closfIt.hasNext()) {
stmt = (Statement) closfIt.next();
}
} finally {
closfIt.close();
}
if (stmt != null) {
Resource outRes = stmt.getSubject();
destination.removeAll(outRes,(Property)null,(RDFNode)null);
} }
} finally {
closfIt.close();
}
if (stmt != null) {
Resource outRes = stmt.getSubject();
destination.removeAll(outRes,(Property)null,(RDFNode)null);
} }
} }
} finally {
closeIt.close();
} }
} finally { csv2rdf = false;
closeIt.close(); getServletContext().setAttribute("csv2rdf", csv2rdf);
} }
csv2rdf = false; else if(csv2rdf && property == null){
getServletContext().setAttribute("csv2rdf", csv2rdf); ClosableIterator closeIt = destination.listSubjects();
} try {
else if(csv2rdf && property == null){ for (Iterator it = closeIt; it.hasNext();) {
ClosableIterator closeIt = destination.listSubjects(); Resource res = (Resource) it.next();
try { if (res.isAnon()) {
for (Iterator it = closeIt; it.hasNext();) {
Resource res = (Resource) it.next();
if (res.isAnon()) {
destination.removeAll(res,(Property)null,(RDFNode)null); destination.removeAll(res,(Property)null,(RDFNode)null);
}
} }
} finally {
closeIt.close();
} }
} finally { csv2rdf = false;
closeIt.close(); getServletContext().setAttribute("csv2rdf", csv2rdf);
} }
csv2rdf = false;
getServletContext().setAttribute("csv2rdf", csv2rdf);
} }
} finally { } finally {