From 9b134252589dcb287c7e3692a9a55dce2d3cc062 Mon Sep 17 00:00:00 2001
From: ass92 <ass92@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 10 Feb 2011 22:03:05 +0000
Subject: [PATCH] NIHVIVO-2108 code correction for nullpointer exception in
 naming blank nodes method.

---
 .../controller/jena/JenaIngestController.java | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
index 1792ee6ea..08760d282 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
@@ -762,48 +762,50 @@ public class JenaIngestController extends BaseEditController {
 			else{
 				destination.add(utils.renameBNodesByPattern(source, namespaceEtc, vreq.getJenaOntModel(), pattern, property));
 			}
-			if(csv2rdf && property!=null){
-				ClosableIterator closeIt = destination.listSubjects();
-				Property prop = ResourceFactory.createProperty(property);
-				try {
-					for (Iterator it = closeIt; it.hasNext();) {
-						Resource res = (Resource) it.next();
-						if (res.isAnon()) {
-							ClosableIterator closfIt = destination.listStatements(res,prop,(RDFNode)null);
-							Statement stmt = null;
-							try {
-								if (closfIt.hasNext()) {
-									stmt = (Statement) closfIt.next();
+			if(csv2rdf!=null){
+				if(csv2rdf && property!=null){
+					ClosableIterator closeIt = destination.listSubjects();
+					Property prop = ResourceFactory.createProperty(property);
+					try {
+						for (Iterator it = closeIt; it.hasNext();) {
+							Resource res = (Resource) it.next();
+							if (res.isAnon()) {
+								ClosableIterator closfIt = destination.listStatements(res,prop,(RDFNode)null);
+								Statement stmt = null;
+								try {
+									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 {
-					closeIt.close();
+					csv2rdf = false;
+					getServletContext().setAttribute("csv2rdf", csv2rdf);
 				}
-				csv2rdf = false;
-				getServletContext().setAttribute("csv2rdf", csv2rdf);
-			}
-			else if(csv2rdf && property == null){
-				ClosableIterator closeIt = destination.listSubjects();
-				try {
-					for (Iterator it = closeIt; it.hasNext();) {
-						Resource res = (Resource) it.next();
-						if (res.isAnon()) {
+				else if(csv2rdf && property == null){
+					ClosableIterator closeIt = destination.listSubjects();
+					try {
+						for (Iterator it = closeIt; it.hasNext();) {
+							Resource res = (Resource) it.next();
+							if (res.isAnon()) {
 								destination.removeAll(res,(Property)null,(RDFNode)null);
+							}
 						}
+					} finally {
+						closeIt.close();
 					}
-				} finally {
-					closeIt.close();
+					csv2rdf = false;
+					getServletContext().setAttribute("csv2rdf", csv2rdf);
 				}
-				csv2rdf = false;
-				getServletContext().setAttribute("csv2rdf", csv2rdf);
 			}
 			
 		} finally {