Browse Source

Correctly handle ServiceCreatorCallback in GetFutureService

pull/503/head
dr-BEat 11 years ago
parent
commit
0666245828
  1. 5
      src/Main/Base/Project/Util/SharpDevelopServiceContainer.cs

5
src/Main/Base/Project/Util/SharpDevelopServiceContainer.cs

@ -161,9 +161,8 @@ namespace ICSharpCode.SharpDevelop @@ -161,9 +161,8 @@ namespace ICSharpCode.SharpDevelop
{
Type serviceType = typeof(T);
lock (services) {
object instance;
if (services.TryGetValue(serviceType, out instance)) {
return Task.FromResult((T)instance);
if (services.ContainsKey(serviceType)) {
return Task.FromResult((T)GetService(serviceType));
} else {
object taskCompletionSource;
if (taskCompletionSources.TryGetValue(serviceType, out taskCompletionSource)) {

Loading…
Cancel
Save