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

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

Revision: 8691
          http://sourceforge.net/p/bigdata/code/8691
Author:   thompsonbry
Date:     2014-10-28 13:12:49 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
Rolling back change for a 1.3.3 release.

See #1038 (xsd:boolean materialization issue)

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-26 05:02:24 UTC (rev 8690)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/join/ChunkedMaterializationOp.java	2014-10-28 13:12:49 UTC (rev 8691)
@@ -502,26 +502,21 @@
                 }
 
                 final BigdataValue value = terms.get(iv);
+                // FIXME Temporarily rolled back for 1.3.3 release. See #1028 (xsd:boolean materialization issue)
+                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.