Mirror
/
mongo-csharp-driver
mirror of https://github.com/mongodb/mongo-csharp-driver.git
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Changed order of projects in CSharpDriver.sln. Renamed FindPrimary to FindServer in MongoServer.

pull/1/head
rstam 15 years ago
parent
b114d8ee45
commit
ac3e632377
3 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      CSharpDriver.sln
  2. 6
      CSharpDriver/Core/MongoServer.cs
  3. 2
      CSharpDriver/Internal/MongoConnection.cs

30
CSharpDriver.sln
View File

@ -1,15 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpDriver", "CSharpDriver\CSharpDriver.csproj", "{AE5166CD-76B0-4911-BD80-CED9521F37A1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BsonLibrary", "BsonLibrary\BsonLibrary.csproj", "{0E9A3A2A-49CD-4F6C-847C-DC79B4B65CE6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpDriverUnitTests", "CSharpDriverUnitTests\CSharpDriverUnitTests.csproj", "{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BsonLibraryUnitTests", "BsonLibraryUnitTests\BsonLibraryUnitTests.csproj", "{10A5FAC2-E26F-4726-B888-26D5B849F805}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CSharpDriverSetup", "CSharpDriverSetup\CSharpDriverSetup.vdproj", "{41D0BDEA-DF49-44B9-BB5F-BB58D02160DA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpDriver", "CSharpDriver\CSharpDriver.csproj", "{AE5166CD-76B0-4911-BD80-CED9521F37A1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BsonLibrary", "BsonLibrary\BsonLibrary.csproj", "{0E9A3A2A-49CD-4F6C-847C-DC79B4B65CE6}"
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CSharpDriverSetup", "CSharpDriverSetup\CSharpDriverSetup.vdproj", "{41D0BDEA-DF49-44B9-BB5F-BB58D02160DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BsonLibraryUnitTests", "BsonLibraryUnitTests\BsonLibraryUnitTests.csproj", "{10A5FAC2-E26F-4726-B888-26D5B849F805}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpDriverUnitTests", "CSharpDriverUnitTests\CSharpDriverUnitTests.csproj", "{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -17,16 +17,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AE5166CD-76B0-4911-BD80-CED9521F37A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE5166CD-76B0-4911-BD80-CED9521F37A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE5166CD-76B0-4911-BD80-CED9521F37A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE5166CD-76B0-4911-BD80-CED9521F37A1}.Release|Any CPU.Build.0 = Release|Any CPU
{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}.Release|Any CPU.Build.0 = Release|Any CPU
{41D0BDEA-DF49-44B9-BB5F-BB58D02160DA}.Debug|Any CPU.ActiveCfg = Debug
{41D0BDEA-DF49-44B9-BB5F-BB58D02160DA}.Release|Any CPU.ActiveCfg = Release
{0E9A3A2A-49CD-4F6C-847C-DC79B4B65CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E9A3A2A-49CD-4F6C-847C-DC79B4B65CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E9A3A2A-49CD-4F6C-847C-DC79B4B65CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -35,6 +25,16 @@ Global
{10A5FAC2-E26F-4726-B888-26D5B849F805}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10A5FAC2-E26F-4726-B888-26D5B849F805}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10A5FAC2-E26F-4726-B888-26D5B849F805}.Release|Any CPU.Build.0 = Release|Any CPU
{AE5166CD-76B0-4911-BD80-CED9521F37A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE5166CD-76B0-4911-BD80-CED9521F37A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE5166CD-76B0-4911-BD80-CED9521F37A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE5166CD-76B0-4911-BD80-CED9521F37A1}.Release|Any CPU.Build.0 = Release|Any CPU
{41D0BDEA-DF49-44B9-BB5F-BB58D02160DA}.Debug|Any CPU.ActiveCfg = Debug
{41D0BDEA-DF49-44B9-BB5F-BB58D02160DA}.Release|Any CPU.ActiveCfg = Release
{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBF3A41B-D0EE-4CA5-ADA6-EB1A4DE903E1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

6
CSharpDriver/Core/MongoServer.cs
View File

@ -187,7 +187,7 @@ namespace MongoDB.CSharpDriver {
if (state != MongoServerState.Connected) {
state = MongoServerState.Connecting;
try {
var results = FindPrimary(timeout);
var results = FindServer(timeout);
List<MongoServerAddress> replicaSet = null;
if (results.CommandResult.Contains("hosts")) {
@ -203,7 +203,7 @@ namespace MongoDB.CSharpDriver {
}
this.replicaSet = replicaSet;
// the connection FindPrimary made to the primary becomes the first connection in the new connection pool
// the connection FindServer made to the primary becomes the first connection in the new connection pool
connectionPool = new MongoConnectionPool(this, results.Address, results.Connection);
state = MongoServerState.Connected;
@ -311,7 +311,7 @@ namespace MongoDB.CSharpDriver {
#endregion
#region private methods
private QueryServerResults FindPrimary(
private QueryServerResults FindServer(
TimeSpan timeout
) {
DateTime deadline = DateTime.UtcNow + timeout;

2
CSharpDriver/Internal/MongoConnection.cs
View File

@ -232,7 +232,7 @@ namespace MongoDB.CSharpDriver.Internal {
}
// normally a connection is linked to a connection pool at the time it is created
// but the very first connection was made by FindPrimary before the connection pool existed
// but the very first connection was made by FindServer before the connection pool existed
// we don't want to waste that connection so it becomes the first connection of the new connection pool
internal void JoinConnectionPool(
MongoConnectionPool connectionPool

Write Preview
Loading…
Cancel
Save