Temporary patch for bug #105

ltrr-arizona-edu · Dec 18, 2017 · 85bfe15 · 85bfe15
1 parent a9de2a2
commit 85bfe15
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/org/tellervo/desktop/sample/TellervoWSILoader.java b/src/main/java/org/tellervo/desktop/sample/TellervoWSILoader.java
@@ -25,7 +25,9 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.tellervo.desktop.core.App;
 import org.tellervo.desktop.io.Metadata;
+import org.tellervo.desktop.ui.Alert;
 import org.tellervo.desktop.wsi.tellervo.NewTridasIdentifier;
 import org.tellervo.desktop.wsi.tellervo.TellervoResourceAccessDialog;
 import org.tellervo.desktop.wsi.tellervo.resources.SeriesResource;
@@ -37,6 +39,7 @@
 import org.tridas.schema.TridasDerivedSeries;
 import org.tridas.schema.TridasIdentifier;
 import org.tridas.schema.TridasRadius;
+import org.tellervo.desktop.wsi.tellervo.NewTridasIdentifier;
 
 
 /**
@@ -199,7 +202,14 @@ protected SeriesResource getResource(Sample s, Map<String, ? extends Object> pro
 		TridasIdentifier seriesIdentifier = s.getSeries().getIdentifier();
 
 		if(seriesIdentifier == null)
-			throw new NullPointerException("Series identifier must not be null for save; use new or existing");
+		{
+			log.warn("Expecting the identifier to not be null.  Proceeding is if saving a new series");
+			seriesIdentifier = NewTridasIdentifier.getInstance(App.domain);
+			s.getSeries().setIdentifier(seriesIdentifier);		
+			Alert.message("Provisional Fix", "A workaround to a bug has just been applied.  Please check your series saved successfully and let the developers know if not!");
+
+			//throw new NullPointerException("Series identifier must not be null for save; use new or existing");
+		}
 
 		// if we're creating a derived series, we have to be careful here and copy it
 		// this is because we don't want to send along any values!