[Swift-commit] r4966 - branches/release-0.93/src/org/griphyn/vdl/mapping

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-08-09 04:33:48 -0500 (Tue, 09 Aug 2011)
New Revision: 4966

Modified:
   branches/release-0.93/src/org/griphyn/vdl/mapping/AbstractDataNode.java
   branches/release-0.93/src/org/griphyn/vdl/mapping/RootArrayDataNode.java
   branches/release-0.93/src/org/griphyn/vdl/mapping/RootDataNode.java
Log:
fix npe when provenance logging is enabled

Modified: branches/release-0.93/src/org/griphyn/vdl/mapping/AbstractDataNode.java
===================================================================
--- branches/release-0.93/src/org/griphyn/vdl/mapping/AbstractDataNode.java	2011-08-08 22:04:52 UTC (rev 4965)
+++ branches/release-0.93/src/org/griphyn/vdl/mapping/AbstractDataNode.java	2011-08-09 09:33:48 UTC (rev 4966)
@@ -454,14 +454,8 @@
                 }
             }
 
-            Mapper m;
+            Mapper m = getActualMapper();
 
-            try {
-                m = this.getMapper();
-            }
-            catch (FutureFault fe) {
-                m = null; // no mapping info if mapper isn't initialised yet
-            }
             if (m != null) {
                 // TODO proper type here
                 // Not sure catching exception here is really the right thing to
@@ -518,6 +512,10 @@
             }
         }
     }
+    
+    protected Mapper getActualMapper() {
+        return null;
+    }
 
     public boolean isClosed() {
         return closed;

Modified: branches/release-0.93/src/org/griphyn/vdl/mapping/RootArrayDataNode.java
===================================================================
--- branches/release-0.93/src/org/griphyn/vdl/mapping/RootArrayDataNode.java	2011-08-08 22:04:52 UTC (rev 4965)
+++ branches/release-0.93/src/org/griphyn/vdl/mapping/RootArrayDataNode.java	2011-08-09 09:33:48 UTC (rev 4966)
@@ -102,6 +102,10 @@
         assert(waitingMapperParam != null);
         throw new FutureNotYetAvailable(waitingMapperParam.getFutureWrapper());
 	}
+	
+	protected Mapper getActualMapper() {
+        return mapper;
+    }
 
 	public boolean isArray() {
 		return true;

Modified: branches/release-0.93/src/org/griphyn/vdl/mapping/RootDataNode.java
===================================================================
--- branches/release-0.93/src/org/griphyn/vdl/mapping/RootDataNode.java	2011-08-08 22:04:52 UTC (rev 4965)
+++ branches/release-0.93/src/org/griphyn/vdl/mapping/RootDataNode.java	2011-08-09 09:33:48 UTC (rev 4966)
@@ -212,6 +212,10 @@
         assert (waitingMapperParam != null);
         throw new FutureNotYetAvailable(waitingMapperParam.getFutureWrapper());
 	}
+	
+	protected Mapper getActualMapper() {
+        return mapper;
+    }
 
 	public boolean isArray() {
 		return false;