From b55aaf094f43d9aff056fa471d11a874c7df02f3 Mon Sep 17 00:00:00 2001
From: Craig Hutchison <kb3eua@users.noreply.github.com>
Date: Sat, 1 Oct 2016 20:50:41 -0400
Subject: [PATCH] fix: allow for null values in HTML select options bound with
 ngValue

This corrects the case of <option [ngValue]="null"> binding a string like "{0: null}" to the model instead of an actual null object.

Closes #10349
---
 .../src/directives/select_multiple_control_value_accessor.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/@angular/forms/src/directives/select_multiple_control_value_accessor.ts b/modules/@angular/forms/src/directives/select_multiple_control_value_accessor.ts
index 8ee7e41e91..e2af99baab 100644
--- a/modules/@angular/forms/src/directives/select_multiple_control_value_accessor.ts
+++ b/modules/@angular/forms/src/directives/select_multiple_control_value_accessor.ts
@@ -121,8 +121,8 @@ export class SelectMultipleControlValueAccessor implements ControlValueAccessor
 
   /** @internal */
   _getOptionValue(valueString: string): any {
-    const opt = this._optionMap.get(_extractId(valueString));
-    return opt ? opt._value : valueString;
+    let key: string = _extractId(valueString);
+    return this._optionMap.has(key) ? this._optionMap.get(key)._value : valueString;
   }
 }