Fix test case hang-up

[modules/paravis.git] / src / Plugins / IntegrationPoints / vtkELNOSurfaceFilter.cxx

diff --git a/src/Plugins/IntegrationPoints/vtkELNOSurfaceFilter.cxx b/src/Plugins/IntegrationPoints/vtkELNOSurfaceFilter.cxx
index 158d8369ade5a948d149d12482fe93bd8999eda8..0403969f98df32e523e5ae5800d2eb21850dffe2 100644 (file)
--- a/src/Plugins/IntegrationPoints/vtkELNOSurfaceFilter.cxx
+++ b/src/Plugins/IntegrationPoints/vtkELNOSurfaceFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2013  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,8 +34,8 @@
 #include "vtkCellData.h"
 #include "vtkIdList.h"
 
-vtkCxxRevisionMacro(vtkELNOSurfaceFilter, "$Revision$")
-;
+//vtkCxxRevisionMacro(vtkELNOSurfaceFilter, "$Revision$")
+//;
 vtkStandardNewMacro(vtkELNOSurfaceFilter)
 ;
 
@@ -72,7 +72,7 @@ int vtkELNOSurfaceFilter::RequestData(vtkInformation *request,
 
   vtkSmartPointer<vtkPVGeometryFilter> geomFilter=vtkSmartPointer<
       vtkPVGeometryFilter>::New();
-  geomFilter->SetInput(usgInClone);
+  geomFilter->SetInputData(usgInClone);
   geomFilter->SetPassThroughCellIds(1);
   geomFilter->SetPassThroughPointIds(1);
   geomFilter->SetUseOutline(0);
@@ -84,9 +84,21 @@ int vtkELNOSurfaceFilter::RequestData(vtkInformation *request,
   vtkIdTypeArray* originalPointIds=vtkIdTypeArray::SafeDownCast(
       surface->GetPointData()->GetArray("vtkOriginalPointIds"));
 
+  if( originalCellIds == NULL )
+  {
+    vtkErrorMacro("vtkPVGeometryFilter return NULL 'vtkOriginalCellIds' array");
+    return 0;
+  }
+
+  if(originalPointIds==NULL)
+  {
+    vtkErrorMacro("vtkPVGeometryFilter return NULL 'vtkOriginalPointIds' array");
+    return 0;
+  }
+
   vtkSmartPointer<vtkShrinkFilter> shrink=
       vtkSmartPointer<vtkShrinkFilter>::New();
-  shrink->SetInput(surface);
+  shrink->SetInputConnection(geomFilter->GetOutputPort(0));
   shrink->SetShrinkFactor(0.9999);
   shrink->Update();