Skip to content

Commit 712c44c

Browse files
authored
Various code fixes (#6)
***NO_CI***
1 parent 465a111 commit 712c44c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

nanoFramework.DependencyInjection/DependencyInjection/ActivatorUtilities.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public int Match(object[] givenParameters)
8585
Type givenType = givenParameters[givenIndex].GetType();
8686
bool givenMatched = false;
8787

88-
for (int applyIndex = applyIndexStart; givenMatched == false && applyIndex != _parameters.Length; ++applyIndex)
88+
for (int applyIndex = applyIndexStart; !givenMatched && applyIndex != _parameters.Length; ++applyIndex)
8989
{
9090
if (_parameterValues[applyIndex] == null
9191
&& _parameters[applyIndex].ParameterType.Equals(givenType)) //TODO: Type.IsAssignableFrom?
@@ -105,7 +105,7 @@ public int Match(object[] givenParameters)
105105
}
106106
}
107107

108-
if (givenMatched == false)
108+
if (!givenMatched)
109109
{
110110
return -1;
111111
}

nanoFramework.DependencyInjection/DependencyInjection/ServiceProviderEngine.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private object[] GetServiceObjects(Type serviceType)
130130
if (descriptor.ServiceType == serviceType)
131131
{
132132
if (descriptor.Lifetime == ServiceLifetime.Singleton
133-
& descriptor.ImplementationInstance != null)
133+
&& descriptor.ImplementationInstance != null)
134134
{
135135
services.Add(descriptor.ImplementationInstance);
136136
}
@@ -295,7 +295,7 @@ private static object CreateDefaultPrimitive(Type type)
295295
if (type == typeof(int)) return default(int);
296296
if (type == typeof(uint)) return default(uint);
297297
if (type == typeof(bool)) return default(bool);
298-
if (type == typeof(bool)) return default(char);
298+
if (type == typeof(char)) return default(char);
299299
if (type == typeof(byte)) return default(byte);
300300
if (type == typeof(sbyte)) return default(sbyte);
301301
if (type == typeof(short)) return default(short);

0 commit comments

Comments
 (0)