Fix connection cleanup on TFSTeamProjectCollection

jenkinsci · Feb 4, 2014 · 17e3272 · 17e3272
1 parent 3d45ad2
commit 17e3272
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/tfs/model/Server.java b/src/main/java/hudson/plugins/tfs/model/Server.java
@@ -1,12 +1,14 @@
 package hudson.plugins.tfs.model;
 
+import com.microsoft.tfs.core.TFSConfigurationServer;
 import hudson.plugins.tfs.TfTool;
 import hudson.plugins.tfs.commands.ServerConfigurationProvider;
 import hudson.plugins.tfs.util.MaskedArgumentListBuilder;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
+import java.lang.reflect.Field;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -136,7 +138,23 @@ public String getLocalHostname() throws IOException, InterruptedException {
 
     public synchronized void close() {
         if (this.tpc != null) {
-           this.tpc.close();
+            // Close the configuration server connection that should be closed by
+            // TFSTeamProjectCollection
+            // The field is private, so use reflection
+            // This should be removed when the TFS SDK is fixed
+            // Post in MSDN forum: social.msdn.microsoft.com/Forums/vstudio/en-US/79985ef1-b35d-4fc5-af0b-b95e28402b83
+            try {
+                Field f = TFSTeamProjectCollection.class.getDeclaredField("configurationServer");
+                f.setAccessible(true);
+                TFSConfigurationServer configurationServer = (TFSConfigurationServer) f.get(this.tpc);
+                if (configurationServer != null) {
+                    configurationServer.close();
+                }
+                f.setAccessible(false);
+            } catch (NoSuchFieldException ignore) {
+            } catch (IllegalAccessException ignore) {
+            }
+            this.tpc.close();
         }
 
     }