Skip to content

Fix for methods returning null collections #18

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
gabikliot merged 4 commits into from
Jan 26, 2015
Merged

Fix for methods returning null collections #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acdcc82
Merge branch 'Fix_for_warning_CS0472'
jkonecki Jan 23, 2015
8a57d29
Merge branch 'master' of https://github.com/jkonecki/orleans
jkonecki Jan 23, 2015
89d094d
Fix for methods returning null collections.
jkonecki Jan 25, 2015
1334559
Reverted changes. Added comments.
jkonecki Jan 26, 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
4 changes: 3 additions & 1 deletion src/OrleansRuntime/Catalog/ActivationDirectory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ public void RemoveTarget(ActivationData target)
}
}

// Returns null if no activations exist for this grain ID, rather than an empty list
/// <summary>
/// Returns null if no activations exist for this grain ID, rather than an empty list
/// </summary>
public List<ActivationData> FindTargets(GrainId key)
{
List<ActivationData> tmp;
Expand Down
12 changes: 12 additions & 0 deletions src/OrleansRuntime/ConsistentRing/ConsistentRingProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,17 @@ public IRingRange GetMyRange()
return MyRange; // its immutable, so no need to clone
}

/// <summary>
/// Returns null if silo is not in the list of members
/// </summary>
public List<SiloAddress> GetMySucessors(int n = 1)
{
return FindSuccessors(MyAddress, n);
}

/// <summary>
/// Returns null if silo is not in the list of members
/// </summary>
public List<SiloAddress> GetMyPredecessors(int n = 1)
{
return FindPredecessors(MyAddress, n);
Expand Down Expand Up @@ -205,6 +211,9 @@ internal void RemoveServer(SiloAddress silo)
}
}

/// <summary>
/// Returns null if silo is not in the list of members
/// </summary>
internal List<SiloAddress> FindPredecessors(SiloAddress silo, int count)
{
lock (membershipRingList)
Expand All @@ -227,6 +236,9 @@ internal List<SiloAddress> FindPredecessors(SiloAddress silo, int count)
}
}

/// <summary>
/// Returns null if silo is not in the list of members
/// </summary>
internal List<SiloAddress> FindSuccessors(SiloAddress silo, int count)
{
lock (membershipRingList)
Expand Down