|
@@ -115,7 +115,7 @@ def query_error_handler(func):
|
|
|
raise QueryError(message)
|
|
raise QueryError(message)
|
|
|
except QueryServerException as e:
|
|
except QueryServerException as e:
|
|
|
message = force_unicode(str(e))
|
|
message = force_unicode(str(e))
|
|
|
- if 'Invalid query handle' in message or 'Invalid OperationHandle' in message:
|
|
|
|
|
|
|
+ if 'Invalid query handle' in message or 'Invalid OperationHandle' in message or 'Invalid or unknown query handle' in message:
|
|
|
raise QueryExpired(e)
|
|
raise QueryExpired(e)
|
|
|
else:
|
|
else:
|
|
|
raise QueryError(message)
|
|
raise QueryError(message)
|
|
@@ -394,7 +394,7 @@ class HS2Api(Api):
|
|
|
try:
|
|
try:
|
|
|
results = db.fetch(handle, start_over=start_over, rows=rows)
|
|
results = db.fetch(handle, start_over=start_over, rows=rows)
|
|
|
except QueryServerException as ex:
|
|
except QueryServerException as ex:
|
|
|
- if re.search('(client inactivity)|(Invalid query handle)', str(ex)) and ex.message:
|
|
|
|
|
|
|
+ if re.search('(client inactivity)|(Invalid query handle)|(Invalid or unknown query handle)', str(ex)) and ex.message:
|
|
|
raise QueryExpired(message=ex.message)
|
|
raise QueryExpired(message=ex.message)
|
|
|
else:
|
|
else:
|
|
|
raise QueryError(ex)
|
|
raise QueryError(ex)
|