[Bigdata-commit] SF.net SVN: bigdata:[3684] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/bop/BOpContext.java

[<tho...@us...>]

Revision: 3684
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3684&view=rev
Author:   thompsonbry
Date:     2010-09-29 19:54:27 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
Fixed another bunch of exceptions from copyValues() when the variable was not bound yet.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/BOpContext.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/BOpContext.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/BOpContext.java	2010-09-29 19:14:33 UTC (rev 3683)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/BOpContext.java	2010-09-29 19:54:27 UTC (rev 3684)
@@ -298,10 +298,14 @@
 
                 final IVariable<?> var = (IVariable<?>) t;
 
-                final Constant<?> newval = new Constant(e.get(i));
+                final Object val = e.get(i);
+                
+                if (val != null) {
 
-                bindingSet.set(var, newval);
+                    bindingSet.set(var, new Constant(val));
 
+                }
+
             }
 
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.