From 37c2990bbaca3b0d47c17b588e7d8d0fc1dc2c68 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 26 Jul 2010 18:40:28 +0000
Subject: [PATCH] Merge r5484 from
 http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

---
 webapp/web/edit/processRdfForm2.jsp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/webapp/web/edit/processRdfForm2.jsp b/webapp/web/edit/processRdfForm2.jsp
index 53ab2cf7b..05e049cf1 100644
--- a/webapp/web/edit/processRdfForm2.jsp
+++ b/webapp/web/edit/processRdfForm2.jsp
@@ -360,8 +360,11 @@ are well formed.
             Field field = fields.get(fieldName);
 
             List<String> copyOfN3 = new ArrayList<String>();
-            for( String str : field.getAssertions()){
-                copyOfN3.add(str);
+            List<String> assertions = field.getAssertions();
+            if (assertions != null) {
+                for( String str : field.getAssertions()){
+                    copyOfN3.add(str);
+                }               
             }
             out.put( fieldName, copyOfN3 );
         }
@@ -374,8 +377,11 @@ are well formed.
             Field field = fields.get(fieldName);
 
             List<String> copyOfN3 = new ArrayList<String>();
-            for( String str : field.getRetractions()){
-                copyOfN3.add(str);
+            List<String> retractions = field.getRetractions();
+            if (retractions != null) {
+                for( String str : field.getRetractions()){
+                    copyOfN3.add(str);
+                    }
             }
             out.put( fieldName, copyOfN3 );
         }