Merge pull request #22 from djereg/master

Cannot read property 'hasOwnProperty' of null
Nodonisko · Apr 12, 2017 · aef15b7 · aef15b7
2 parents 2b898f2 + fa0403d
commit aef15b7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/cache.service.ts b/src/cache.service.ts
@@ -314,9 +314,9 @@ export class CacheService {
    * @return {boolean} - data from cache
    */
   public static isRequest(data: any): boolean {
-    if (data instanceof Request || (typeof data === 'object' && data.hasOwnProperty('_body') && data.hasOwnProperty('status') &&
+    if (data && (data instanceof Request || (typeof data === 'object' && data.hasOwnProperty('_body') && data.hasOwnProperty('status') &&
       data.hasOwnProperty('statusText') && data.hasOwnProperty('type') && data.hasOwnProperty('headers')
-      && data.hasOwnProperty('url'))) {
+      && data.hasOwnProperty('url')))) {
       return true;
     } else {
       return false;