[geos-commits] r3671 - in trunk: capi tests/unit/capi

[svn_geos at osgeo.org]

Author: strk
Date: 2012-06-07 08:10:18 -0700 (Thu, 07 Jun 2012)
New Revision: 3671

Modified:
   trunk/capi/geos_ts_c.cpp
   trunk/tests/unit/capi/GEOSInterruptTest.cpp
Log:
Revert the interrupt request callback reset on initGEOS

Once you set a callback why would you want it unregistered on
initGEOS ? You will not want that....

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2012-06-07 14:41:32 UTC (rev 3670)
+++ trunk/capi/geos_ts_c.cpp	2012-06-07 15:10:18 UTC (rev 3671)
@@ -209,7 +209,6 @@
     }
 
     geos::util::Interrupt::cancel();
-    geos::util::Interrupt::registerCallback(0,0);
 
     return static_cast<GEOSContextHandle_t>(extHandle);
 }

Modified: trunk/tests/unit/capi/GEOSInterruptTest.cpp
===================================================================
--- trunk/tests/unit/capi/GEOSInterruptTest.cpp	2012-06-07 14:41:32 UTC (rev 3670)
+++ trunk/tests/unit/capi/GEOSInterruptTest.cpp	2012-06-07 15:10:18 UTC (rev 3671)
@@ -99,7 +99,7 @@
         finishGEOS();
     }
 
-    /// Test interrupt callback being reset by initGEOS
+    /// Test interrupt callback being NOT reset by initGEOS
     template<>
     template<>
     void object::test<2>()
@@ -120,7 +120,7 @@
 
         ensure("GEOSBufferWithStyle failed", 0 != geom2);
 
-        ensure_equals(numcalls, 0);
+        ensure("interrupt callback never called", numcalls > 0);
 
         GEOSGeom_destroy(geom1);
         GEOSGeom_destroy(geom2);