Backed out changeset 9cc4d49b29b0 (bug 881237) for xpcshell failures
authorWes Kocher <wkocher@mozilla.com>
Thu, 26 Sep 2013 15:32:59 -0700
changeset 163677 20855adc0ef108c99eaee803422d3bc0abaceeda
parent 163676 87a72129c007ff13b4ee9d8f0108a96eb85ea41a
child 163678 5b35eb07b456230d507df38326032ae6bbffb043
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs881237
milestone27.0a1
backs out9cc4d49b29b055a0fe87f82ad0e9a6e7840731cc
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 9cc4d49b29b0 (bug 881237) for xpcshell failures
xpcom/components/nsComponentManager.cpp
xpcom/tests/component/TestComponent.cpp
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -489,17 +489,16 @@ nsComponentManagerImpl::RegisterCIDEntry
         aEntry->cid->ToProvidedString(idstr);
 
         nsCString existing;
         if (f->mModule)
             existing = f->mModule->Description();
         else
             existing = "<unknown module>";
 
-        mLock.Unlock();
         LogMessage("While registering XPCOM module %s, trying to re-register CID '%s' already registered by %s.",
                    aModule->Description().get(),
                    idstr,
                    existing.get());
         return;
     }
 
     f = new nsFactoryEntry(aEntry, aModule);
--- a/xpcom/tests/component/TestComponent.cpp
+++ b/xpcom/tests/component/TestComponent.cpp
@@ -14,18 +14,19 @@ NS_DEFINE_NAMED_CID(NS_TESTING_CID);
 static nsresult
 DummyConstructorFunc(nsISupports* aOuter, const nsIID& aIID, void** aResult)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 static const mozilla::Module::CIDEntry kTestCIDs[] = {
   { &kNS_TESTING_CID, false, NULL, DummyConstructorFunc },
-  { &kNS_TESTING_CID, false, NULL, DummyConstructorFunc },
   { NULL }
 };
 
 static const mozilla::Module kTestModule = {
   mozilla::Module::kVersion,
   kTestCIDs
 };
 
 NSMODULE_DEFN(dummy) = &kTestModule;
+
+