Merge branch 'version02' of https://dev.stratosphere.eu/git/stage1 in…

…to version02
VonRosenchild · Jun 27, 2012 · 60efa8e · 60efa8e
2 parents 1e5b1c7 + 3d664ea
commit 60efa8e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/pact/pact-clients/src/main/java/eu/stratosphere/pact/testing/TestPlan.java b/pact/pact-clients/src/main/java/eu/stratosphere/pact/testing/TestPlan.java
@@ -509,9 +509,6 @@ private Plan buildPlanWithReadableSinks() {
  // need a format which is deserializable without configuration
  if (!fileSink.getFormatClass().equals(SequentialOutputFormat.class)) {
  TestRecords expectedValues = this.expectedOutputs.get(fileSink);
- // but only if we need to check for values anyways
- if (expectedValues == null)
- continue;
 
  final FileDataSink safeSink = createDefaultSink(fileSink.getName());
 
@@ -520,7 +517,9 @@ private Plan buildPlanWithReadableSinks() {
  wrappedSinks.add(fileSink);
  wrappedSinks.add(safeSink);
 
- this.expectedOutputs.put(safeSink, expectedValues);
+ // only add to expected outputs if we need to check for values
+ if (expectedValues != null)
+ this.expectedOutputs.put(safeSink, expectedValues);
  this.actualOutputs.put(safeSink, this.getActualOutput(fileSink));
  this.getActualOutput(fileSink).fromFile(SequentialInputFormat.class, safeSink.getFilePath());