[mapserver-commits] r9372 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-10-01 18:11:01 -0400 (Thu, 01 Oct 2009)
New Revision: 9372

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapraster.c
Log:
fix raster thread lock deadlock condition (#3145)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-01 19:21:41 UTC (rev 9371)
+++ trunk/mapserver/HISTORY.TXT	2009-10-01 22:11:01 UTC (rev 9372)
@@ -14,7 +14,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fix raster thread deadlock condition on posix/linux (#3145)
 
+
 Version 5.6.0-beta2 (2009-10-01):
 ---------------------------------
 

Modified: trunk/mapserver/mapraster.c
===================================================================
--- trunk/mapserver/mapraster.c	2009-10-01 19:21:41 UTC (rev 9371)
+++ trunk/mapserver/mapraster.c	2009-10-01 22:11:01 UTC (rev 9372)
@@ -1532,7 +1532,9 @@
                 }
             }
 
+            msReleaseLock( TLOCK_GDAL );
             msGetGDALGeoTransform( hDS, map, layer, adfGeoTransform );
+            msAcquireLock( TLOCK_GDAL );
 
             /* 
             ** We want to resample if the source image is rotated, if