From e6c9bd09f1eb0e56f1a95aa466f813444e96fde4 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Thu, 30 Jan 2014 20:56:48 +0100
Subject: [PATCH] fix NPE, handle CancellationException in BitmapTileLayer

---
 vtm/src/org/oscim/layers/tile/BitmapTileLayer.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/vtm/src/org/oscim/layers/tile/BitmapTileLayer.java b/vtm/src/org/oscim/layers/tile/BitmapTileLayer.java
index f0786f3d..0c996d9f 100644
--- a/vtm/src/org/oscim/layers/tile/BitmapTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/BitmapTileLayer.java
@@ -120,7 +120,17 @@ public class BitmapTileLayer extends TileLayer<TileLoader> {
 		@Override
 		protected boolean executeJob(MapTile tile) {
 			mTile = tile;
-			return mTileDataSource.executeQuery(tile, this) == QueryResult.SUCCESS;
+			QueryResult result = null;
+			try {
+				result = mTileDataSource.executeQuery(tile, this);
+			} catch (CancellationException e) {
+				log.debug("{} was canceled", mTile);
+			} catch (Exception e) {
+				log.debug("{} {}", mTile, e.getMessage());
+			} finally {
+				mTile = null;
+			}
+			return result == QueryResult.SUCCESS;
 		}
 
 		@Override