Revert "Fixes Solenoid Memory Leak"

ThadHouse · ThadHouse · commit a510ff03797d · 2016-02-07T12:06:12.000-08:00
This reverts commit 3b2975a.
diff --git a/WPILib/DoubleSolenoid.cs b/WPILib/DoubleSolenoid.cs
@@ -58,11 +58,11 @@ private void InitSolenoid()
                 IntPtr port = GetPortWithModule((byte)ModuleNumber, (byte)m_forwardChannel);
                 m_forwardSolenoid = InitializeSolenoidPort(port, ref status);
                 CheckStatus(status);
-                FreePort(port);
+
                 port = GetPortWithModule((byte)ModuleNumber, (byte)m_reverseChannel);
                 m_reverseSolenoid = InitializeSolenoidPort(port, ref status);
                 CheckStatus(status);
-                FreePort(port);
+
                 HAL.Base.HAL.Report(ResourceType.kResourceType_Solenoid, (byte)m_forwardChannel, (byte)(ModuleNumber));
                 HAL.Base.HAL.Report(ResourceType.kResourceType_Solenoid, (byte)m_reverseChannel, (byte)(ModuleNumber));
                 LiveWindow.LiveWindow.AddActuator("DoubleSolenoid", ModuleNumber, m_forwardChannel, this);
diff --git a/WPILib/Solenoid.cs b/WPILib/Solenoid.cs
@@ -40,7 +40,6 @@ private void InitSolenoid()
                 IntPtr port = GetPortWithModule((byte)ModuleNumber, (byte)m_channel);
                 m_solenoidPort = InitializeSolenoidPort(port, ref status);
                 CheckStatus(status);
-                FreePort(port);
                 LiveWindow.LiveWindow.AddActuator("Solenoid", ModuleNumber, m_channel, this);
                 Report(ResourceType.kResourceType_Solenoid, (byte)m_channel, (byte)ModuleNumber);
             }
diff --git a/WPILib/SolenoidBase.cs b/WPILib/SolenoidBase.cs
@@ -33,10 +33,8 @@ protected SolenoidBase(int moduleNumber)
             {
                 ModuleNumber = moduleNumber;
                 int status = 0;
-                IntPtr port = GetPortWithModule((byte)ModuleNumber, 0);
-                m_port = InitializeSolenoidPort(port, ref status);
+                m_port = InitializeSolenoidPort(GetPortWithModule((byte) ModuleNumber, 0), ref status);
                 CheckStatus(status);
-                FreePort(port);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ private void InitSolenoid()`
`40`	`40`	`IntPtr port = GetPortWithModule((byte)ModuleNumber, (byte)m_channel);`
`41`	`41`	`m_solenoidPort = InitializeSolenoidPort(port, ref status);`
`42`	`42`	`CheckStatus(status);`
`43`		`- FreePort(port);`
`44`	`43`	`LiveWindow.LiveWindow.AddActuator("Solenoid", ModuleNumber, m_channel, this);`
`45`	`44`	`Report(ResourceType.kResourceType_Solenoid, (byte)m_channel, (byte)ModuleNumber);`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,8 @@ protected SolenoidBase(int moduleNumber)`
`33`	`33`	`{`
`34`	`34`	`ModuleNumber = moduleNumber;`
`35`	`35`	`int status = 0;`
`36`		`- IntPtr port = GetPortWithModule((byte)ModuleNumber, 0);`
`37`		`- m_port = InitializeSolenoidPort(port, ref status);`
	`36`	`+ m_port = InitializeSolenoidPort(GetPortWithModule((byte) ModuleNumber, 0), ref status);`
`38`	`37`	`CheckStatus(status);`
`39`		`- FreePort(port);`
`40`	`38`	`}`
`41`	`39`	`}`
`42`	`40`