From 3f1bd13bb57e0e6db9d529b62b9b071732119a53 Mon Sep 17 00:00:00 2001
From: David Alpert <david@spinthemoose.com>
Date: Fri, 31 Jul 2015 17:48:10 -0500
Subject: [PATCH] replacing null with an empty object hung off ApiConnection as
 suggested by @haacked

---
 Octokit.Tests/Clients/TeamsClientTests.cs | 2 +-
 Octokit/Clients/TeamsClient.cs            | 2 +-
 Octokit/Http/ApiConnection.cs             | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Octokit.Tests/Clients/TeamsClientTests.cs b/Octokit.Tests/Clients/TeamsClientTests.cs
index cf49349aab..a99513e06b 100644
--- a/Octokit.Tests/Clients/TeamsClientTests.cs
+++ b/Octokit.Tests/Clients/TeamsClientTests.cs
@@ -165,7 +165,7 @@ public async Task AllowsEmptyBody()
 
                 connection.Received().Put<Dictionary<string, string>>(
                     Arg.Is<Uri>(u => u.ToString() == "teams/1/memberships/user"),
-                    Arg.Is<string>(u => u == null));
+                    Arg.Is<object>(u => u == ApiConnection.EmptyBody));
             }
 
             [Fact]
diff --git a/Octokit/Clients/TeamsClient.cs b/Octokit/Clients/TeamsClient.cs
index 4afab495d2..d2a5288cf5 100644
--- a/Octokit/Clients/TeamsClient.cs
+++ b/Octokit/Clients/TeamsClient.cs
@@ -164,7 +164,7 @@ public async Task<TeamMembership> AddMembership(int id, string login)
 
             try
             {
-                response = await ApiConnection.Put<Dictionary<string, string>>(endpoint, null);
+                response = await ApiConnection.Put<Dictionary<string, string>>(endpoint, Octokit.ApiConnection.EmptyBody);
             }
             catch (NotFoundException)
             {
diff --git a/Octokit/Http/ApiConnection.cs b/Octokit/Http/ApiConnection.cs
index 9b1656f5bf..b9db71d347 100644
--- a/Octokit/Http/ApiConnection.cs
+++ b/Octokit/Http/ApiConnection.cs
@@ -15,6 +15,9 @@ public class ApiConnection : IApiConnection
     {
         readonly IApiPagination _pagination;
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2211:NonConstantFieldsShouldNotBeVisible")]
+        public static object EmptyBody = new object();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiConnection"/> class.
         /// </summary>