Author: gates
Date: Sat Jul 12 12:29:37 2008
New Revision: 676218
URL: http://svn.apache.org/viewvc?rev=676218&view=rev
Log:
PIG-302 Checkin cogroup.patch
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POForEach.java
Modified:
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POForEach.java
URL:
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POForEach.java?rev=676218&r1=676217&r2=676218&view=diff
==============================================================================
---
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POForEach.java
(original)
+++
incubator/pig/branches/types/src/org/apache/pig/impl/physicalLayer/relationalOperators/POForEach.java
Sat Jul 12 12:29:37 2008
@@ -231,9 +231,9 @@
its[i] = null;
}
}
+
- Boolean done = false;
- while(!done) {
+ while(true) {
if(data == null) {
//getNext being called for the first time or starting on new
input data
//we instantiate the template array and start populating it
with data
@@ -243,7 +243,11 @@
if(its[i].hasNext()) {
data[i] = its[i].next();
} else {
- //the input set is null, so we return
+ //the input set is null, so we return. This is
+ // caught above and this function recalled with
+ // new inputs.
+ its = null;
+ data = null;
res.returnStatus = POStatus.STATUS_NULL;
return res;
}
@@ -277,7 +281,7 @@
}
}
- return null;
+ //return null;
}
/**
