From 31af635646298b3e353875867dbcf834c3778e32 Mon Sep 17 00:00:00 2001
From: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Date: Wed, 16 May 2012 11:42:29 -0400
Subject: [PATCH] Working to fix collboration test failures.

---
 .../vtkPVDataDeliveryManager.cxx              | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/ParaViewCore/ClientServerCore/vtkPVDataDeliveryManager.cxx b/ParaViewCore/ClientServerCore/vtkPVDataDeliveryManager.cxx
index b4b923edbd..ed5cfadf59 100644
--- a/ParaViewCore/ClientServerCore/vtkPVDataDeliveryManager.cxx
+++ b/ParaViewCore/ClientServerCore/vtkPVDataDeliveryManager.cxx
@@ -110,6 +110,17 @@ public:
       this->ActualMemorySize = data? data->GetActualMemorySize() : 0;
       }
 
+    void SetDeliveredDataObject(vtkDataObject* data)
+      {
+      this->Producer->SetOutput(data);
+      this->ActualMemorySize = data? data->GetActualMemorySize() : 0;
+      }
+
+    vtkDataObject* GetDeliveredDataObject()
+      {
+      return this->Producer->GetOutputDataObject(0);
+      }
+
     vtkPVTrivialProducer* GetProducer() const
       { return this->Producer.GetPointer(); }
     vtkDataObject* GetDataObject() const
@@ -526,9 +537,10 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned
       {
       dataMover->SetMoveModeToClone();
       }
-    dataMover->SetInputConnection(item->GetProducer()->GetOutputPort());
+    dataMover->SetInputData(data);
     dataMover->Update();
-    item->SetDataObject(dataMover->GetOutputDataObject(0));
+
+    item->SetDeliveredDataObject(dataMover->GetOutputDataObject(0));
     }
 
   // There's a possibility that we'd need to do ordered compositing.
@@ -548,7 +560,7 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned
         item.Representation->GetVisibility() &&
         item.Redistributable)
         {
-        cutsGenerator->AddInputData(item.GetDataObject());
+        cutsGenerator->AddInputData(item.GetDeliveredDataObject());
         }
       }
 
@@ -583,11 +595,9 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned
         continue;
         }
 
-      vtkDataObject* data = item->GetDataObject();
-
       vtkNew<vtkOrderedCompositeDistributor> redistributor;
       redistributor->SetController(vtkMultiProcessController::GetGlobalController());
-      redistributor->SetInputData(data);
+      redistributor->SetInputData(item->GetDeliveredDataObject());
       redistributor->SetPKdTree(this->KdTree);
       redistributor->SetPassThrough(0);
       redistributor->Update();
-- 
2.24.1