show more meaningful error message after session timeout

OSBI · Aug 12, 2013 · f0cabb1 · f0cabb1
1 parent 2e111c4
commit f0cabb1
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/saiku-core/saiku-service/src/main/java/org/saiku/service/olap/OlapQueryService.java b/saiku-core/saiku-service/src/main/java/org/saiku/service/olap/OlapQueryService.java
@@ -999,12 +999,20 @@ private void putIQuery(String queryName, IQuery query) {
 	}
 
 	private void removeIQuery(String queryName) {
-		queries.remove(queryName);
+		if (queries.containsKey(queryName)) {
+			IQuery q = queries.remove(queryName);
+			try {
+				q.cancel();
+			} catch (Exception e) {}
+			q = null;
+		}
 	}
-
-
+
 	private IQuery getIQuery(String queryName) {
-		return  queries.get(queryName);
+		if (queries.containsKey(queryName)) {
+			return  queries.get(queryName);
+		}
+		throw new SaikuServiceException("No query found using name: " + queryName);
 	}
 
 	private Map<String, IQuery> getIQueryMap() {