[Pkg-mozext-commits] [requestpolicy] 204/280: merge #582

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 2e25f6324d4968801e7ed7ba8cd64dbb5d25a48f
Author: Martin Kimmerle <dev at 256k.de>
Date:   Wed Feb 4 18:55:28 2015 +0100

    merge #582
---
 src/content/lib/ruleset.jsm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/content/lib/ruleset.jsm b/src/content/lib/ruleset.jsm
index 6ee351b..030a884 100644
--- a/src/content/lib/ruleset.jsm
+++ b/src/content/lib/ruleset.jsm
@@ -677,14 +677,17 @@ DomainEntry.prototype = {
   },
 
   addLowerLevel : function(name, entry) {
-    if (this._lower[name]) {
+    if (this._lower.hasOwnProperty(name)) {
       throw "ENTRY_ALREADY_EXISTS";
     }
     this._lower[name] = entry;
   },
 
   getLowerLevel : function(name) {
-    return this._lower[name] || null;
+    if (this._lower.hasOwnProperty(name)) {
+      return this._lower[name];
+    }
+    return null;
   }
 };
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git