Skip to content

Commit a8287b2

Browse files
LuukN2commonsensesoftware
authored andcommitted
Fix type with no dependencies not resolving dependencies for other types.
1 parent 1deec52 commit a8287b2

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/Common.OData.ApiExplorer/AspNet.OData/DefaultModelTypeBuilder.cs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -251,20 +251,19 @@ private Type ResolveDependencies( TypeBuilder typeBuilder, EdmTypeKey typeKey )
251251
{
252252
var typeInfo = type.CreateTypeInfo();
253253
generatedEdmTypes.GetOrAdd( key, typeInfo );
254-
255-
if ( key == typeKey )
256-
{
257-
return typeInfo;
258-
}
259254
}
260255
}
256+
}
261257

262-
if ( !dependencies.ContainsKey( typeKey ) )
263-
{
264-
var typeInfo = typeBuilder.CreateTypeInfo();
265-
generatedEdmTypes.GetOrAdd( key, typeInfo );
266-
return typeBuilder.CreateTypeInfo();
267-
}
258+
if ( !dependencies.ContainsKey( typeKey ) )
259+
{
260+
var typeInfo = typeBuilder.CreateTypeInfo();
261+
generatedEdmTypes.GetOrAdd( typeKey, typeInfo );
262+
}
263+
264+
if ( generatedEdmTypes.TryGetValue( typeKey, out var generatedType ) )
265+
{
266+
return generatedType;
268267
}
269268

270269
return typeBuilder;

0 commit comments

Comments
 (0)