[banshee/stable-2.0] Last.fm: Close HTTP streams when finished with them (bgo#642140)
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/stable-2.0] Last.fm: Close HTTP streams when finished with them (bgo#642140)
- Date: Sat, 16 Apr 2011 01:03:47 +0000 (UTC)
commit 3804cee8be3b00c15d5e59ae0098d42467f80468
Author: Dustin C. Hatch <admiralnemo gmail com>
Date: Thu Apr 14 19:21:52 2011 -0500
Last.fm: Close HTTP streams when finished with them (bgo#642140)
Signed-off-by: Gabriel Burt <gabriel burt gmail com>
.../Lastfm/Lastfm/AudioscrobblerConnection.cs | 49 ++++++++++---------
1 files changed, 26 insertions(+), 23 deletions(-)
---
diff --git a/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs b/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
index 306923e..e8e6ce7 100644
--- a/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
+++ b/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
@@ -368,6 +368,8 @@ namespace Lastfm
state = State.Idle;
}
+
+ sr.Close ();
}
//
@@ -478,6 +480,7 @@ namespace Lastfm
}
state = State.Idle;
+ sr.Close ();
}
//
@@ -590,30 +593,30 @@ namespace Lastfm
WebResponse my_resp = now_playing_post.EndGetResponse (ar);
Stream s = my_resp.GetResponseStream ();
- StreamReader sr = new StreamReader (s, Encoding.UTF8);
-
- string line = sr.ReadLine ();
- if (line == null) {
- Log.Warning ("Audioscrobbler NowPlaying failed", "No response", false);
- }
+ using (StreamReader sr = new StreamReader (s, Encoding.UTF8)) {
+ string line = sr.ReadLine ();
+ if (line == null) {
+ Log.Warning ("Audioscrobbler NowPlaying failed", "No response", false);
+ }
- if (line.StartsWith ("BADSESSION")) {
- Log.Warning ("Audioscrobbler NowPlaying failed", "Session ID sent was invalid", false);
- // attempt to re-handshake on the next interval
- session_id = null;
- next_interval = DateTime.Now + new TimeSpan (0, 0, RETRY_SECONDS);
- state = State.NeedHandshake;
- StartTransitionHandler ();
- return;
- } else if (line.StartsWith ("OK")) {
- // NowPlaying submitted
- Log.DebugFormat ("Submitted NowPlaying track to Audioscrobbler");
- now_playing_started = false;
- now_playing_post = null;
- current_now_playing_data = null;
- return;
- } else {
- Log.Warning ("Audioscrobbler NowPlaying failed", "Unexpected or no response", false);
+ if (line.StartsWith ("BADSESSION")) {
+ Log.Warning ("Audioscrobbler NowPlaying failed", "Session ID sent was invalid", false);
+ // attempt to re-handshake on the next interval
+ session_id = null;
+ next_interval = DateTime.Now + new TimeSpan (0, 0, RETRY_SECONDS);
+ state = State.NeedHandshake;
+ StartTransitionHandler ();
+ return;
+ } else if (line.StartsWith ("OK")) {
+ // NowPlaying submitted
+ Log.DebugFormat ("Submitted NowPlaying track to Audioscrobbler");
+ now_playing_started = false;
+ now_playing_post = null;
+ current_now_playing_data = null;
+ return;
+ } else {
+ Log.Warning ("Audioscrobbler NowPlaying failed", "Unexpected or no response", false);
+ }
}
}
catch (Exception e) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]