[mapserver-commits] r12350 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:18:50 -0700 (Fri, 26 Aug 2011)
New Revision: 12350

Modified:
   trunk/mapserver/mapcache/src/tileset.c
Log:
fix compilation warning
thomas.bonfort | 2011-04-19 18:54:57 +0200 (Tue, 19 Apr 2011)

Modified: trunk/mapserver/mapcache/src/tileset.c
===================================================================
--- trunk/mapserver/mapcache/src/tileset.c	2011-08-26 11:18:45 UTC (rev 12349)
+++ trunk/mapserver/mapcache/src/tileset.c	2011-08-26 11:18:50 UTC (rev 12350)
@@ -348,7 +348,13 @@
       /* the previous step has successfully finished, we can now query the cache to return the tile content */
       ret = tile->tileset->cache->tile_get(ctx, tile);
       if(ret != GEOCACHE_SUCCESS) {
-         ctx->set_error(ctx, 500, "tileset %s: failed to re-get tile %d %d %d from cache after set", tile->tileset->name,tile->x,tile->y,tile->z);
+         if(isLocked == GEOCACHE_TRUE) {
+            ctx->set_error(ctx, 500, "tileset %s: unknown error (another thread/process failed to create the tile I was waiting for)",
+                  tile->tileset->name);
+         } else {
+            /* shouldn't really happen, as the error ought to have been caught beforehand */
+            ctx->set_error(ctx, 500, "tileset %s: failed to re-get tile %d %d %d from cache after set", tile->tileset->name,tile->x,tile->y,tile->z);
+         }
       }
    }
 }