Merge pull request rackspace#593 from jamiehannaford/cdn-fix

Fix CDN container population

Author: Jamie Hannaford

doc/services/object-store/cdn.rst

@@ -71,6 +71,12 @@ Once a container has been CDN-enabled, you can retrieve it like so:
 
   $cdnContainer = $cdnService->cdnContainer('{containerName}');
 
+If you already have a container object and want to avoid instantiating a new service, you can also do:
+
+.. code-block:: php
+
+  $cdnContainer = $container->getCdn();
+
 
 Retrieve the SSL URL of a CDN container
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

lib/OpenCloud/ObjectStore/CDNService.php

@@ -54,18 +54,19 @@ public function cdnContainer($data)
     {
         $container = new CDNContainer($this, $data);
 
-        $metadata = new ContainerMetadata();
-        $metadata->setArray(array(
-            'Streaming-Uri' => $data->cdn_streaming_uri,
-            'Ios-Uri' => $data->cdn_ios_uri,
-            'Ssl-Uri' => $data->cdn_ssl_uri,
-            'Enabled' => $data->cdn_enabled,
-            'Ttl' => $data->ttl,
-            'Log-Retention' => $data->log_retention,
-            'Uri' => $data->cdn_uri,
-        ));
-
-        $container->setMetadata($metadata);
+        if (is_object($data)) {
+            $metadata = new ContainerMetadata();
+            $metadata->setArray(array(
+                'Streaming-Uri' => $data->cdn_streaming_uri,
+                'Ios-Uri'       => $data->cdn_ios_uri,
+                'Ssl-Uri'       => $data->cdn_ssl_uri,
+                'Enabled'       => $data->cdn_enabled,
+                'Ttl'           => $data->ttl,
+                'Log-Retention' => $data->log_retention,
+                'Uri'           => $data->cdn_uri,
+            ));
+            $container->setMetadata($metadata);
+        }
 
         return $container;
     }