Bug 1048435: Stop RDF from whining at shutdown. r=mccr8
authorKyle Huey <khuey@kylehuey.com>
Mon, 04 Aug 2014 16:51:20 -0700
changeset 197766 f98b64ba7b2b1347088a860eec7d567d79ccabf2
parent 197765 cbc4345674393130372a4250eeeaa2f9ad6be843
child 197767 c9d277d8e9637e0bd2e58bfb32e887d25bca37c8
push idunknown
push userunknown
push dateunknown
reviewersmccr8
bugs1048435
milestone34.0a1
Bug 1048435: Stop RDF from whining at shutdown. r=mccr8
rdf/build/nsRDFModule.cpp
--- a/rdf/build/nsRDFModule.cpp
+++ b/rdf/build/nsRDFModule.cpp
@@ -141,39 +141,19 @@ static const mozilla::Module::ContractID
     { NS_RDF_CONTRACTID "/rdf-service;1", &kNS_RDFSERVICE_CID },
     { NS_RDF_CONTRACTID "/xml-parser;1", &kNS_RDFXMLPARSER_CID },
     { NS_RDF_CONTRACTID "/xml-serializer;1", &kNS_RDFXMLSERIALIZER_CID },
     { NS_RDF_SERIALIZER "ntriples", &kNS_RDFNTRIPLES_SERIALIZER_CID },
     { NS_LOCALSTORE_CONTRACTID, &kNS_LOCALSTORE_CID },
     { nullptr }
 };
 
-static nsresult
-StartupRDFModule()
-{
-    if (RDFServiceImpl::gRDFService) {
-        NS_ERROR("Leaked the RDF service from a previous startup.");
-        RDFServiceImpl::gRDFService = nullptr;
-    }
-
-    return NS_OK;
-}
-
-static void
-ShutdownRDFModule()
-{
-    if (RDFServiceImpl::gRDFService) {
-        // XXX make this an assertion!
-        NS_WARNING("Leaking the RDF Service.");
-    }
-}
-
 static const mozilla::Module kRDFModule = {
     mozilla::Module::kVersion,
     kRDFCIDs,
     kRDFContracts,
     nullptr,
     nullptr,
-    StartupRDFModule,
-    ShutdownRDFModule
+    nullptr,
+    nullptr
 };
 
 NSMODULE_DEFN(nsRDFModule) = &kRDFModule;