Skip to content

Commit d61d2af

Browse files
committed
fix reshaper inspect results.
1 parent ed6aeb4 commit d61d2af

22 files changed

Lines changed: 38 additions & 19 deletions

TryCSharp.Samples/AdoNet/DbCommandTimeoutSample01.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Data.Common;
22
using System.Diagnostics;
33
using TryCSharp.Common;
4+
// ReSharper disable PossibleNullReferenceException
45

56
namespace TryCSharp.Samples.AdoNet
67
{

TryCSharp.Samples/AdoNet/ExcelConnectSamples01.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Data;
22
using System.Data.Common;
33
using TryCSharp.Common;
4+
// ReSharper disable PossibleNullReferenceException
45

56
namespace TryCSharp.Samples.AdoNet
67
{

TryCSharp.Samples/AdoNet/TextConnectSamples01.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Data;
22
using System.Data.Common;
33
using TryCSharp.Common;
4+
// ReSharper disable PossibleNullReferenceException
45

56
namespace TryCSharp.Samples.AdoNet
67
{

TryCSharp.Samples/Advanced/AppDomainSamples02.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void Execute()
4646
private void AppDomain_Unload(object sender, EventArgs e)
4747
{
4848
var domain = sender as AppDomain;
49-
Output.WriteLine("AppDomain.Unload: {0}", domain.FriendlyName);
49+
Output.WriteLine("AppDomain.Unload: {0}", domain?.FriendlyName);
5050
}
5151

5252
private void AppDomain_ProcessExit(object sender, EventArgs e)
@@ -67,7 +67,7 @@ private void AppDomain_ProcessExit(object sender, EventArgs e)
6767
//Thread.Sleep(TimeSpan.FromSeconds(3));
6868

6969
var domain = sender as AppDomain;
70-
Output.WriteLine("AppDomain.ProcessExit: {0}", domain.FriendlyName);
70+
Output.WriteLine("AppDomain.ProcessExit: {0}", domain?.FriendlyName);
7171
}
7272
}
7373
}

TryCSharp.Samples/Advanced/ProgressSamples01.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void InitializeEvent()
109109
}
110110
};
111111

112-
_btn.Click += (s, e) => { (_btn.Tag as CancellationTokenSource).Cancel(); };
112+
_btn.Click += (s, e) => { (_btn.Tag as CancellationTokenSource)?.Cancel(); };
113113
}
114114

115115
async Task Compress(CancellationToken token, IProgress<ProgressMessage> progress)

TryCSharp.Samples/Advanced/SerializationSurrogateSamples01.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ private class CanNotSerializeSurrogate : ISerializationSurrogate
171171
public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
172172
{
173173
var targetObj = obj as CanNotSerialize;
174+
if (targetObj == null)
175+
{
176+
return;
177+
}
174178

175179
//
176180
// シリアライズする項目と値を以下のようにinfoに設定していく.
@@ -184,6 +188,10 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
184188
ISurrogateSelector selector)
185189
{
186190
var targetObj = obj as CanNotSerialize;
191+
if (targetObj == null)
192+
{
193+
return null;
194+
}
187195

188196
//
189197
// infoから値を取得し、対象となるオブジェクトに設定.

TryCSharp.Samples/Basic/ComparerSamples01.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using TryCSharp.Common;
4+
// ReSharper disable PossibleNullReferenceException
45

56
namespace TryCSharp.Samples.Basic
67
{

TryCSharp.Samples/Linq/LinqSamples28.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Generic;
22
using System.Linq;
33
using TryCSharp.Common;
4+
// ReSharper disable PossibleNullReferenceException
45

56
namespace TryCSharp.Samples.Linq
67
{

TryCSharp.Samples/Linq/LinqSamples84.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Linq;
22
using System.Xml.Linq;
33
using TryCSharp.Common;
4+
// ReSharper disable PossibleNullReferenceException
45

56
namespace TryCSharp.Samples.Linq
67
{

TryCSharp.Samples/Linq/LinqSamples85.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Xml;
66
using System.Xml.Linq;
77
using TryCSharp.Common;
8+
// ReSharper disable PossibleNullReferenceException
89

910
namespace TryCSharp.Samples.Linq
1011
{

0 commit comments

Comments
 (0)