From 5a0c0b1bcf4323f89e66b83ee2abae4530c653ff Mon Sep 17 00:00:00 2001
From: "jwalden%mit.edu" <jwalden%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 10 Mar 2008 23:02:36 +0000
Subject: [PATCH] Bug 421767 -
 element.attributes.removeNamedItemNS(<non-existent attribute NS and name>)
 returns null instead of throwing.  acid3++  r+sr=jst, a=beltzner

git-svn-id: svn://10.0.0.236/trunk@247506 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsDOMAttributeMap.cpp            | 2 +-
 mozilla/dom/tests/mochitest/dom-level2-core/exclusions.js | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp
index 3a05ad0d930..db632eacf17 100644
--- a/mozilla/content/base/src/nsDOMAttributeMap.cpp
+++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp
@@ -481,7 +481,7 @@ nsDOMAttributeMap::RemoveNamedItemNS(const nsAString& aNamespaceURI,
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!*aReturn) {
-    return NS_OK;
+    return NS_ERROR_DOM_NOT_FOUND_ERR;
   }
 
   nsCOMPtr<nsIAttribute> attr = do_QueryInterface(*aReturn);
diff --git a/mozilla/dom/tests/mochitest/dom-level2-core/exclusions.js b/mozilla/dom/tests/mochitest/dom-level2-core/exclusions.js
index 8a0b61e1364..dd1269fa53a 100644
--- a/mozilla/dom/tests/mochitest/dom-level2-core/exclusions.js
+++ b/mozilla/dom/tests/mochitest/dom-level2-core/exclusions.js
@@ -59,16 +59,12 @@ bug371552 = ["elementhasattributens02"];
 wrongDocError = ["elementsetattributenodens05", "namednodemapsetnameditemns03",
                  "setAttributeNodeNS05", "setNamedItemNS02"];
 attrAppendChild = ["elementsetattributenodens06", "importNode01"];
-removeNamedItemNS = ["namednodemapremovenameditemns06",
-                     "namednodemapremovenameditemns07",
-                     "namednodemapremovenameditemns08",
-                     "removeNamedItemNS02"];
 bogusPrefix = ["nodesetprefix05", "nodesetprefix09", "prefix06", "prefix07"];
 prefixReplacement = ["setAttributeNodeNS04"];
 
 var todoTests = {};
 var exclusions = concat(dtdTests, bug371552, wrongDocError, attrAppendChild,
-                        removeNamedItemNS, bogusPrefix, prefixReplacement);
+                        bogusPrefix, prefixReplacement);
 for (var excludedTestName in exclusions) { 
   todoTests[exclusions[excludedTestName]] = true; 
 }