Skip to content

Minor tweaks to allow to programmatically configure providers. #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergeybykov merged 2 commits into from
Feb 27, 2015
Merged

Minor tweaks to allow to programmatically configure providers. #170

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4f2c42
Minor tweaks to allow to programmatically configure providers.
gabikliot Feb 26, 2015
e568763
Switched to initializing childConfigurations to an empty list instead…
gabikliot Feb 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Orleans/Configuration/ProviderConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace Orleans.Runtime.Configuration
public class ProviderConfiguration : IProviderConfiguration
{
private IDictionary<string, string> properties;
private IList<ProviderConfiguration> childConfigurations;
private readonly IList<ProviderConfiguration> childConfigurations;
private IList<IProvider> childProviders;
[NonSerialized]
private IProviderManager providerManager;
Expand All @@ -52,27 +52,28 @@ public class ProviderConfiguration : IProviderConfiguration
internal ProviderConfiguration()
{
properties = new Dictionary<string, string>();
childConfigurations = new List<ProviderConfiguration>();
}

public ProviderConfiguration(IDictionary<string, string> properties, string type, string name)
{
this.properties = properties;
Type = type;
Name = name;
childConfigurations = new List<ProviderConfiguration>();
}

// for testing purposes
internal ProviderConfiguration(IDictionary<string, string> properties, IList<IProvider> childProviders)
{
this.properties = properties;
this.childProviders = childProviders;
childConfigurations = new List<ProviderConfiguration>();
}

// Load from an element with the format <Provider Type="..." Name="...">...</Provider>
internal void Load(XmlElement child, IDictionary<string, IProviderConfiguration> alreadyLoaded, XmlNamespaceManager nsManager)
{
childConfigurations = new List<ProviderConfiguration>();

if (nsManager == null)
{
nsManager = new XmlNamespaceManager(new NameTable());
Expand Down Expand Up @@ -144,7 +145,7 @@ internal void SetProviderManager(IProviderManager manager)
child.SetProviderManager(manager);
}

internal void SetProperty(string key, string val)
public void SetProperty(string key, string val)
{
if (!properties.ContainsKey(key))
{
Expand Down