diff --git a/Source/Csla.Channels.RabbitMq/RabbitMqPortal.cs b/Source/Csla.Channels.RabbitMq/RabbitMqPortal.cs index 2f1e932f9a..2c5f0973bf 100644 --- a/Source/Csla.Channels.RabbitMq/RabbitMqPortal.cs +++ b/Source/Csla.Channels.RabbitMq/RabbitMqPortal.cs @@ -150,7 +150,7 @@ private async Task Create(CriteriaRequest request) request = ConvertRequest(request); // unpack criteria data into object - object? criteria = GetCriteria(_applicationContext, request.CriteriaData); + object criteria = GetCriteria(_applicationContext, request.CriteriaData); if (criteria is DataPortalClient.PrimitiveCriteria primitiveCriteria) { criteria = primitiveCriteria.Value; @@ -194,7 +194,7 @@ private async Task Fetch(CriteriaRequest request) request = ConvertRequest(request); // unpack criteria data into object - object? criteria = GetCriteria(_applicationContext, request.CriteriaData); + object criteria = GetCriteria(_applicationContext, request.CriteriaData); if (criteria is DataPortalClient.PrimitiveCriteria primitiveCriteria) { criteria = primitiveCriteria.Value; diff --git a/Source/Csla.Web.Mvc.Shared/Server/Hosts/HttpPortalController.cs b/Source/Csla.Web.Mvc.Shared/Server/Hosts/HttpPortalController.cs index 43bfc81cf6..b59702cf90 100644 --- a/Source/Csla.Web.Mvc.Shared/Server/Hosts/HttpPortalController.cs +++ b/Source/Csla.Web.Mvc.Shared/Server/Hosts/HttpPortalController.cs @@ -221,7 +221,7 @@ private async Task InvokeTextPortal(string operation, Stream requestStream, Stre var requestBuffer = new MemoryStream(requestArray); var serializer = _applicationContext.GetRequiredService(); - DataPortalResponse? result = new DataPortalResponse(); + DataPortalResponse result = new DataPortalResponse(); try { var request = await DeserializeRequestBody(requestBuffer, serializer); diff --git a/Source/Csla/Core/MobileBindingList.cs b/Source/Csla/Core/MobileBindingList.cs index 04b6152921..28ccb6448a 100644 --- a/Source/Csla/Core/MobileBindingList.cs +++ b/Source/Csla/Core/MobileBindingList.cs @@ -163,7 +163,7 @@ protected virtual void OnGetChildren(SerializationInfo info, MobileFormatter for List references = new List(); for (int x = 0; x < Count; x++) { - T? child = this[x]; + T child = this[x]; if (child != null) { SerializationInfo childInfo = formatter.SerializeObject(child); diff --git a/Source/Csla/Core/MobileObservableCollection.cs b/Source/Csla/Core/MobileObservableCollection.cs index 809c0dd685..41c5f49878 100644 --- a/Source/Csla/Core/MobileObservableCollection.cs +++ b/Source/Csla/Core/MobileObservableCollection.cs @@ -136,7 +136,7 @@ protected virtual void OnGetChildren(SerializationInfo info, MobileFormatter for List references = new List(); for (int x = 0; x < Count; x++) { - T? child = this[x]; + T child = this[x]; if (child != null) { SerializationInfo childInfo = formatter.SerializeObject(child); diff --git a/Source/Csla/Data/SafeDataReader.cs b/Source/Csla/Data/SafeDataReader.cs index 42d25b16e3..35e3de9c1d 100644 --- a/Source/Csla/Data/SafeDataReader.cs +++ b/Source/Csla/Data/SafeDataReader.cs @@ -810,7 +810,7 @@ public object? this[string name] if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException(string.Format(Properties.Resources.StringNotNullOrWhiteSpaceException, nameof(name)), nameof(name)); - object? val = DataReader[name]; + object val = DataReader[name]; if (DBNull.Value.Equals(val)) return null; else