Skip to content

Commit 07f524c

Browse files
Revert "Fixing NullReferenceException issue with SqlDataAdapter (dotnet#3749)" (dotnet#3854)
This reverts commit c23fed6.
1 parent deb8c31 commit 07f524c

3 files changed

Lines changed: 1 addition & 259 deletions

File tree

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ private SqlDataReader TryFetchInputParameterEncryptionInfo(
12931293
// not present as the rpcName, as is the case with non-_batchRPCMode. So
12941294
// input parameters start at parameters[1]. parameters[0] is the actual
12951295
// T-SQL Statement. rpcName is sp_executesql.
1296-
if (_RPCList[i].systemParams != null && _RPCList[i].systemParams.Length > 1)
1296+
if (_RPCList[i].systemParams.Length > 1)
12971297
{
12981298
_RPCList[i].needsFetchParameterEncryptionMetadata = true;
12991299

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs

Lines changed: 0 additions & 255 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<OutputPath>$(BinFolder)$(Configuration).$(Platform).$(AssemblyName)</OutputPath>
1313
<IsTestProject>true</IsTestProject>
1414
</PropertyGroup>
15-
<ItemGroup Condition="'$(TestSet)' == 'AE'">
16-
<Compile Include="AlwaysEncrypted\SqlDataAdapterBatchUpdateTests.cs" />
17-
</ItemGroup>
1815
<ItemGroup Condition="'$(TestSet)' == '' or '$(TestSet)' == 'AE'">
1916
<Compile Include="AlwaysEncrypted\ConversionTests.cs" />
2017
<Compile Include="AlwaysEncrypted\ExceptionsGenericError.cs" />

0 commit comments

Comments
 (0)