github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

Update ServiceDescriptor.cs

pull/460/merge^2
Buddhika Chathuranga 2020-05-30 01:54:13 +05:30
parent 505b4679b7
commit 0d1d561d42
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/WinSWCore/ServiceDescriptor.cs
View File

@ -71,8 +71,7 @@ namespace winsw
{ {
using(var reader = new StreamReader(BasePath + ".xml")) using(var reader = new StreamReader(BasePath + ".xml"))
{ {
string xml = reader.ReadToEnd(); dom = ServiceDescriptor.XmlValidation(reader);
dom = ServiceDescriptor.XmlValidation(xml);
} }
} }
catch (XmlException e) catch (XmlException e)
@ -110,11 +109,11 @@ namespace winsw
// ReSharper disable once InconsistentNaming // ReSharper disable once InconsistentNaming
public static ServiceDescriptor FromXML(string xml) public static ServiceDescriptor FromXML(string xml)
{ {
return new ServiceDescriptor(XmlValidation(xml)); return new ServiceDescriptor(XmlValidation(new StringReader(xml)));
} }
public static XmlDocument XmlValidation(string xml) public static XmlDocument XmlValidation(TextReader textReader)
{ {
XmlReaderSettings settings = new XmlReaderSettings(); XmlReaderSettings settings = new XmlReaderSettings();
Assembly a = Assembly.GetExecutingAssembly(); Assembly a = Assembly.GetExecutingAssembly();
@ -135,7 +134,7 @@ namespace winsw
} }
} }
var reader = XmlReader.Create(new StringReader(xml), settings); var reader = XmlReader.Create(textReader, settings);
var xmlDoc = new XmlDocument(); var xmlDoc = new XmlDocument();
xmlDoc.Load(reader); xmlDoc.Load(reader);

2
src/Test/winswTests/ServiceDescriptorTests.cs
View File

@ -456,7 +456,7 @@ $@"<service>
</id> </id>
"; ";
Assert.That(() => ServiceDescriptor.XmlValidation(seedXml), Throws.Exception.TypeOf<XmlException>()); Assert.That(() => ServiceDescriptor.XmlValidation(new StringReader(seedXml)), Throws.Exception.TypeOf<XmlException>());
} }
} }
} }