Merge pull request lorenzo#4 from risou/features/exception

check Exception class in method _handleException
ryosukes · May 11, 2014 · 9772d12 · 9772d12
2 parents ba84f9a + 43c0c51
commit 9772d12
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Model/SimpleQueue.php b/Model/SimpleQueue.php
@@ -205,10 +205,16 @@ protected function _handleException(Exception $e) {
 			'AWS.SimpleQueueService.NonExistentQueue'
 		);
 
-		if (in_array($e->getExceptionCode(), $fatalErrors) || $this->_exceptionCount >= 25) {
+		if ($this->_exceptionCount >= 25) {
 			throw $e;
 		}
 
+		if ($e instanceof Aws\Common\Exception\ServiceResponseException) {
+			if (in_array($e->getExceptionCode(), $fatalErrors)) {
+				throw $e;
+			}
+		}
+
 		$this->_exceptionCount++;
 		CakeLog::error($e->getMessage(), 'sqs');
 		return false;