[Bigdata-commit] SF.net SVN: bigdata:[4117] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/bop/join/PipelineJoin.java

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

Revision: 4117
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4117&view=rev
Author:   thompsonbry
Date:     2011-01-16 22:45:32 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
More work on [1].

[1] https://sourceforge.net/apps/trac/bigdata/ticket/230

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

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java	2011-01-16 21:09:33 UTC (rev 4116)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java	2011-01-16 22:45:32 UTC (rev 4117)
@@ -728,6 +728,7 @@
 				 * This is used for processing errors and also if this task is
 				 * interrupted (because the sink has been closed).
 				 */
+				// ensure query halts.
 				halt(t);
                 
 				// reset the unsync buffers.
@@ -759,7 +760,12 @@
 					log.error(t2.getLocalizedMessage(), t2);
 				}
 
-				throw new RuntimeException(t);
+				if (getCause() != null) {
+					// abnormal termination.
+					throw new RuntimeException(t);
+				}
+				// normal termination - ignore exception.
+				return null;
 
 				// } finally {
 				//            	
@@ -1040,9 +1046,16 @@
 					return null;
 
 				} catch (Throwable t) {
-	                
-					throw new RuntimeException(halt(t));
 
+					// ensure query halts.
+					halt(t);
+					if (getCause() != null) {
+						// abnormal termination.
+						throw new RuntimeException(t);
+					}
+					// normal terminate - ignore exception.
+					return null;
+					
 				}
 
 			}
@@ -1674,7 +1687,13 @@
 
 				} catch (Throwable t) {
 
-					throw new RuntimeException(halt(t));
+					// ensure query halts.
+					halt(t);
+					if (getCause() != null) {
+						// abnormal termination.
+						throw new RuntimeException(t);
+					}
+					// normal termination - ignore exception.
 
 				} finally {
 
@@ -1880,7 +1899,13 @@
 
 				} catch (Throwable t) {
 
-					throw new RuntimeException(halt(t));
+					// ensure query halts.
+					halt(t);
+					if (getCause() != null) {
+						// abnormal termination.
+						throw new RuntimeException(t);
+					}
+					// normal termination - ignore exception.
 
 				} finally {
 
@@ -2070,7 +2095,14 @@
 
 				} catch (Throwable t) {
 
-					throw new RuntimeException(halt(t));
+					// ensure query halts.
+					halt(t);
+					if (getCause() != null) {
+						// abnormal termination.
+						throw new RuntimeException(t);
+					}
+					// normal termination - ignore exception.
+					return null;
 
 				}
 


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