[Bigdata-commit] SF.net SVN: bigdata:[8690] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java

[<jer...@us...>]

Revision: 8690
          http://sourceforge.net/p/bigdata/code/8690
Author:   jeremy_carroll
Date:     2014-10-26 05:02:24 +0000 (Sun, 26 Oct 2014)
Log Message:
-----------
Fix for trac1028: do not (accidentally) remove an iv from a literal.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java	2014-10-17 20:40:08 UTC (rev 8689)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java	2014-10-26 05:02:24 UTC (rev 8690)
@@ -503,20 +503,25 @@
 
                 final BigdataValue value = terms.get(iv);
 
-                if (value == null && iv.needsMaterialization()) {
+                if (value == null ) {
+                	
+                	if ( iv.needsMaterialization() ) {
 
-                    throw new RuntimeException("Could not resolve: iv=" + iv);
+                        throw new RuntimeException("Could not resolve: iv=" + iv);
+                    
+                	} // else do nothing, e.g. for a literal - DO NOT remove the binding, trac1028.
 
+                } else {
+
+                	/*
+                	 * Replace the binding.
+                	 * 
+                	 * FIXME This probably needs to strip out the
+                	 * BigdataSail#NULL_GRAPH since that should not become bound.
+                	 */
+                	((IV) iv).setValue(value);
                 }
 
-                /*
-                 * Replace the binding.
-                 * 
-                 * FIXME This probably needs to strip out the
-                 * BigdataSail#NULL_GRAPH since that should not become bound.
-                 */
-                ((IV) iv).setValue(value);
-
             }
             
         } else {

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