Skip to content

Commit 04d12e2

Browse files
committed
Reuse _suffix field instead of passing it around
1 parent a48c9e3 commit 04d12e2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/NHibernate/Loader/DefaultEntityAliases.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ public DefaultEntityAliases(IDictionary<string, string[]> userProvidedAliases, I
2727
_suffix = suffix;
2828
_userProvidedAliases = userProvidedAliases?.Count > 0 ? userProvidedAliases : null;
2929

30-
SuffixedKeyAliases = DetermineKeyAliases(persister, suffix);
30+
SuffixedKeyAliases = DetermineKeyAliases(persister);
3131
SuffixedPropertyAliases = GetSuffixedPropertyAliases(persister);
32-
SuffixedDiscriminatorAlias = DetermineDiscriminatorAlias(persister, suffix);
32+
SuffixedDiscriminatorAlias = DetermineDiscriminatorAlias(persister);
3333

3434
SuffixedVersionAliases = persister.IsVersioned ? SuffixedPropertyAliases[persister.VersionProperty] : null;
3535
//rowIdAlias is generated on demand in property
3636
}
3737

38-
private string[] DetermineKeyAliases(ILoadable persister, string suffix)
38+
private string[] DetermineKeyAliases(ILoadable persister)
3939
{
4040
if (_userProvidedAliases == null)
41-
return GetIdentifierAliases(persister, suffix);
41+
return GetIdentifierAliases(persister, _suffix);
4242

4343
return GetUserProvidedAliases(persister.IdentifierPropertyName)
4444
?? GetUserProvidedAliases(EntityPersister.EntityID)
45-
?? GetIdentifierAliases(persister, suffix);
45+
?? GetIdentifierAliases(persister, _suffix);
4646
}
4747

48-
private string DetermineDiscriminatorAlias(ILoadable persister, string suffix)
48+
private string DetermineDiscriminatorAlias(ILoadable persister)
4949
{
5050
if (_userProvidedAliases == null)
51-
return GetDiscriminatorAlias(persister, suffix);
51+
return GetDiscriminatorAlias(persister, _suffix);
5252

5353
return GetUserProvidedAlias(AbstractEntityPersister.EntityClass)
54-
?? GetDiscriminatorAlias(persister, suffix);
54+
?? GetDiscriminatorAlias(persister, _suffix);
5555
}
5656

5757
/// <summary>

0 commit comments

Comments
 (0)