fix for when content type for json lies

basho-labs · Sep 27, 2013 · f757e24 · f757e24
1 parent 24dc088
commit f757e24
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/riak.js b/app/riak.js
@@ -301,7 +301,13 @@ function RiakObject(bucketName, key, client, body, contentType, vclock) {
   }
   if (contentType === 'application/json') {
     if (body !== undefined) {
-      this.body = JSON.parse(body);
+      try {
+        this.body = JSON.parse(body);
+      }
+      catch (err) {
+        // the content type lied to us
+        this.body = body;
+      }
     }
     else {
       this.body = '';