Просмотр исходного кода

Better detection of queue list

- Check for error code before throwing exception
- Return empty array on empty list

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22982 44c647ce-9c0f-0410-b52a-842ac1e357ba
matthew 15 лет назад
Родитель
Сommit
bfbe581adc
1 измененных файлов с 6 добавлено и 2 удалено
  1. 6 2
      library/Zend/Service/Amazon/Sqs.php

+ 6 - 2
library/Zend/Service/Amazon/Sqs.php

@@ -159,11 +159,15 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
     {
         $result = $this->_makeRequest(null, 'ListQueues');
 
+        if (isset($result->Error)) {
+            require_once 'Zend/Service/Amazon/Sqs/Exception.php';
+            throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
+        }
+
         if (!isset($result->ListQueuesResult->QueueUrl)
             || empty($result->ListQueuesResult->QueueUrl)
         ) {
-            require_once 'Zend/Service/Amazon/Sqs/Exception.php';
-            throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
+            return array();
         }
 
         $queues = array();