From 3717da7feacfd21066e99b9ff91607463a0328b9 Mon Sep 17 00:00:00 2001
From: briancaruso <briancaruso@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 1 Nov 2011 16:16:02 +0000
Subject: [PATCH] Checking for null when adding formSpecificData

---
 .../templatemodels/edit/EditConfigurationTemplateModel.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
index 3eea60a28..6b0b035c3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
@@ -82,7 +82,8 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	
     	//Get the form specific data
     	HashMap<String, Object> formSpecificData = editConfig.getFormSpecificData();
-    	pageData.putAll(formSpecificData);
+    	if( formSpecificData != null)
+    	    pageData.putAll(formSpecificData);
     	populateDropdowns();
     	//populate html with edit element where appropriate
     	populateGeneratedHtml();