Bug fixes

KnowledgeCaptureAndDiscovery · Aug 24, 2018 · 0a8ec5a · 0a8ec5a
1 parent 1d28701
commit 0a8ec5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/planner/src/main/java/edu/isi/wings/catalog/data/api/impl/kb/DataKB.java b/planner/src/main/java/edu/isi/wings/catalog/data/api/impl/kb/DataKB.java
@@ -126,12 +126,11 @@ public String getDataLocation(String dataid) {
   	  this.start_read();
   		KBObject locprop = this.kb.getProperty(this.dcns + "hasLocation");
   		KBObject dobj = this.kb.getIndividual(dataid);
-  		if(dobj == null)
-  		  return null;
-
-  		KBObject locobj = this.kb.getPropertyValue(dobj, locprop);
-  		if (locobj != null && locobj.getValue() != null)
-  			return locobj.getValueAsString();
+  		if(dobj != null) {
+    		KBObject locobj = this.kb.getPropertyValue(dobj, locprop);
+    		if (locobj != null && locobj.getValue() != null)
+    			return locobj.getValueAsString();
+  		}
   		else {
   			String location = this.getDefaultDataLocation(dataid);
   			File f = new File(location);

diff --git a/planner/src/main/java/edu/isi/wings/workflow/plan/api/impl/pplan/PPlan.java b/planner/src/main/java/edu/isi/wings/workflow/plan/api/impl/pplan/PPlan.java
@@ -39,10 +39,10 @@ public class PPlan extends URIEntity
   private static final long serialVersionUID = 1L;
 
   transient Properties props;
-  OntFactory ontologyFactory;
+  transient OntFactory ontologyFactory;
   boolean incomplete;
 
-  TransactionsJena transaction;
+  transient TransactionsJena transaction;
 
   ArrayList<ExecutionStep> steps;