mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
catch undefined URIs in makeURI; use Svc global to cache IO service
This commit is contained in:
parent
c3dc0195a6
commit
90d45aefc0
@ -349,12 +349,10 @@ let Utils = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
makeURI: function Weave_makeURI(URIString) {
|
makeURI: function Weave_makeURI(URIString) {
|
||||||
if (URIString === null || URIString == "")
|
if (!URIString)
|
||||||
return null;
|
return null;
|
||||||
let ioservice = Cc["@mozilla.org/network/io-service;1"].
|
|
||||||
getService(Ci.nsIIOService);
|
|
||||||
try {
|
try {
|
||||||
return ioservice.newURI(URIString, null, null);
|
return Svc.IO.newURI(URIString, null, null);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let log = Log4Moz.repository.getLogger("Service.Util");
|
let log = Log4Moz.repository.getLogger("Service.Util");
|
||||||
log.debug("Could not create URI: " + e);
|
log.debug("Could not create URI: " + e);
|
||||||
@ -510,3 +508,4 @@ Utils.EventListener.prototype = {
|
|||||||
|
|
||||||
let Svc = {};
|
let Svc = {};
|
||||||
Utils.lazyInstance(Svc, 'Json', "@mozilla.org/dom/json;1", Ci.nsIJSON);
|
Utils.lazyInstance(Svc, 'Json', "@mozilla.org/dom/json;1", Ci.nsIJSON);
|
||||||
|
Utils.lazySvc(Svc, 'IO', "@mozilla.org/network/io-service;1", Ci.nsIIOService);
|
||||||
|
Loading…
Reference in New Issue
Block a user