From 6706fb299066b1ec7a76f9986b6eb0b6c56c30c6 Mon Sep 17 00:00:00 2001 From: olegoid Date: Wed, 27 Apr 2016 12:55:28 -0300 Subject: [PATCH 1/2] [Foundation] Add null check to Observer cback --- src/Foundation/NSObject2.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Foundation/NSObject2.cs b/src/Foundation/NSObject2.cs index c1df9c2b5c24..d032783ff8e0 100644 --- a/src/Foundation/NSObject2.cs +++ b/src/Foundation/NSObject2.cs @@ -788,6 +788,9 @@ class Observer : NSObject { public Observer (NSObject obj, NSString key, Action cback) { + if (cback == null) + throw new ArgumentNullException ("cback"); + this.obj = new WeakReference (obj); this.key = key; this.cback = cback; From 66695f43849dff6f89faec0dcae93e328f4dd3b4 Mon Sep 17 00:00:00 2001 From: olegoid Date: Thu, 28 Apr 2016 13:35:59 -0300 Subject: [PATCH 2/2] [Foundation] Rename parameter name from cback to observer --- src/Foundation/NSObject2.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Foundation/NSObject2.cs b/src/Foundation/NSObject2.cs index d032783ff8e0..f79d7f9507fd 100644 --- a/src/Foundation/NSObject2.cs +++ b/src/Foundation/NSObject2.cs @@ -786,14 +786,14 @@ class Observer : NSObject { Action cback; NSString key; - public Observer (NSObject obj, NSString key, Action cback) + public Observer (NSObject obj, NSString key, Action observer) { - if (cback == null) - throw new ArgumentNullException ("cback"); + if (observer == null) + throw new ArgumentNullException (nameof(observer)); this.obj = new WeakReference (obj); this.key = key; - this.cback = cback; + this.cback = observer; IsDirectBinding = false; }