Merge pull request #307 from ryanseys/fix-pubsub

fix: pubsub ack regression test - empty message
googleapis · Nov 24, 2014 · 7b4e843 · 7b4e843
2 parents 0ef2c4a + 57213ee
commit 7b4e843
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/pubsub/subscription.js b/lib/pubsub/subscription.js
@@ -149,9 +149,9 @@ Subscription.formatMessage_ = function(msg) {
   var message = {
     id: msg.ackId
   };
-  if (msg.pubsubEvent && msg.pubsubEvent.message) {
-    message.data =
-      new Buffer(msg.pubsubEvent.message.data, 'base64').toString('utf-8');
+  var evt = msg.pubsubEvent;
+  if (evt && evt.message && evt.message.data) {
+    message.data = new Buffer(evt.message.data, 'base64').toString('utf-8');
     try {
       message.data = JSON.parse(message.data);
     } catch(e) {}