wasSharpNET

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ 27  →  ?path2? @ 22
/Serialization/XmlSerializerCache.cs
@@ -18,12 +18,9 @@
{
public static class XmlSerializerCache
{
private static readonly ReaderWriterLockSlim SerializerCacheLock =
new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
private static readonly ReaderWriterLockSlim SerializerCacheLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
private static readonly Dictionary<string, XmlSerializer> SerializerCache = new Dictionary<string, XmlSerializer>();
 
private static readonly Dictionary<string, XmlSerializer> SerializerCache =
new Dictionary<string, XmlSerializer>();
 
public static XmlSerializer GetSerializer<T>()
{
return GetSerializer<T>(null);
@@ -43,7 +40,9 @@
{
var Signature = MainTypeForSerialization.FullName;
if (ExtraTypes != null)
Signature = ExtraTypes.Aggregate(Signature, (current, tp) => current + "-" + tp.FullName);
{
Signature = ExtraTypes.Aggregate(Signature, (current, tp) => current + ("-" + tp.FullName));
}
 
SerializerCacheLock.EnterReadLock();
XmlSerializer XmlEventSerializer;
@@ -94,14 +93,14 @@
{
try
{
using (var memoryStream = new MemoryStream())
using (MemoryStream memoryStream = new MemoryStream())
{
using (var streamWriter = new StreamWriter(memoryStream))
using (StreamWriter streamWriter = new StreamWriter(memoryStream))
{
streamWriter.Write(XmlData);
streamWriter.Flush();
memoryStream.Position = 0;
return (T) GetSerializer<T>(ExtraTypes).Deserialize(memoryStream);
return (T)GetSerializer<T>(ExtraTypes).Deserialize(memoryStream);
}
}
}
@@ -115,11 +114,11 @@
{
try
{
using (var memoryStream = new MemoryStream())
using (MemoryStream memoryStream = new MemoryStream())
{
using (var streamReader = new StreamReader(memoryStream))
using (StreamReader streamReader = new StreamReader(memoryStream))
{
using (var xmlWriter = XmlWriter.Create(memoryStream, new XmlWriterSettings {Indent = true}))
using (var xmlWriter = XmlWriter.Create(memoryStream, new XmlWriterSettings { Indent = true }))
{
var ns = new XmlSerializerNamespaces();
ns.Add(string.Empty, string.Empty);
@@ -180,4 +179,4 @@
return Deserialize<T>(reader.ReadToEnd(), null);
}
}
}
}