svn commit: r773523 - /incubator/shindig/trunk/php/src/gadgets/templates/DataPipelining.php

[ch...@apache.org]

Author: chabotc
Date: Mon May 11 11:08:49 2009
New Revision: 773523

URL: http://svn.apache.org/viewvc?rev=773523&view=rev
Log:
Fixed a small issue when data pipelining == null on proxied content views

Modified:
    incubator/shindig/trunk/php/src/gadgets/templates/DataPipelining.php

Modified: incubator/shindig/trunk/php/src/gadgets/templates/DataPipelining.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/templates/DataPipelining.php?rev=773523&r1=773522&r2=773523&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/templates/DataPipelining.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/templates/DataPipelining.php Mon May 11 11:08:49 2009
@@ -76,23 +76,25 @@
    */
   static public function fetch($dataPipeliningRequests, GadgetContext $context, $dataContext = array()) {
     $result = array();
-    do {
-      // See which requests we can batch together, that either don't use dynamic tags or who's tags are resolvable
-      $requestQueue = array();
-      foreach ($dataPipeliningRequests as $key => $request) {
-        if (($resolved = self::resolveRequest($request, $result)) !== false) {
-          $requestQueue[] = $resolved;
-          unset($dataPipeliningRequests[$key]);
+    if (is_array($dataPipeliningRequests) && count($dataPipeliningRequests)) {
+      do {
+        // See which requests we can batch together, that either don't use dynamic tags or who's tags are resolvable
+        $requestQueue = array();
+        foreach ($dataPipeliningRequests as $key => $request) {
+          if (($resolved = self::resolveRequest($request, $result)) !== false) {
+            $requestQueue[] = $resolved;
+            unset($dataPipeliningRequests[$key]);
+          }
         }
-      }
-      if (count($requestQueue)) {
-        $returnedResults = self::performRequests($requestQueue, $context);
-        if (is_array($returnedResults)) {
-          $dataContext = self::addResultToContext($returnedResults, $dataContext);
-          $result = array_merge($returnedResults, $result);
+        if (count($requestQueue)) {
+          $returnedResults = self::performRequests($requestQueue, $context);
+          if (is_array($returnedResults)) {
+            $dataContext = self::addResultToContext($returnedResults, $dataContext);
+            $result = array_merge($returnedResults, $result);
+          }
         }
-      }
-    } while (count($requestQueue));
+      } while (count($requestQueue));
+    }
     return $result;
   }