diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-04 17:40:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 17:40:44 -0500 |
| commit | e4a041b8321e49fd9b21fb0f890caf23d4752212 (patch) | |
| tree | 7e4be1c765afd026350f9c450264747b6adf4eca /MediaBrowser.Controller/Net | |
| parent | 72ee4b189d35606ae60b1717ba5b318680025627 (diff) | |
| parent | 340a2c651276d911285a6ff09944c5eba2384a51 (diff) | |
Merge pull request #283 from Bond-009/gpl-cleanup
Post GPL cleanup
Diffstat (limited to 'MediaBrowser.Controller/Net')
| -rw-r--r-- | MediaBrowser.Controller/Net/AuthorizationInfo.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Net/AuthorizationInfo.cs b/MediaBrowser.Controller/Net/AuthorizationInfo.cs index a68060db5b..848d8fa15c 100644 --- a/MediaBrowser.Controller/Net/AuthorizationInfo.cs +++ b/MediaBrowser.Controller/Net/AuthorizationInfo.cs @@ -1,7 +1,6 @@ using MediaBrowser.Controller.Entities; using System; - namespace MediaBrowser.Controller.Net { public class AuthorizationInfo @@ -12,12 +11,7 @@ namespace MediaBrowser.Controller.Net /// <value>The user identifier.</value> public Guid UserId { get { - if (User == null) { - return Guid.Empty; - } - else { - return User.Id; - } + return User == null ? Guid.Empty : User.Id; } } diff --git a/MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs b/MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs index b200f883a3..26abbc2d2a 100644 --- a/MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs +++ b/MediaBrowser.Controller/Net/WebSocketConnectEventArgs.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Specialized; using MediaBrowser.Model.Services; namespace MediaBrowser.Controller.Net @@ -7,7 +6,6 @@ namespace MediaBrowser.Controller.Net /// <summary> /// Class WebSocketConnectEventArgs /// </summary> - public class WebSocketConnectingEventArgs : EventArgs { /// <summary> |