commit c4abaae5d1b3f9a85be4a21beda4c6b574e10bd1
author Ivan Furnadjiev <ivan@eclipsesource.com> Mon Jul 28 17:25:54 2014 +0300
committer Ivan Furnadjiev <ivan@eclipsesource.com> Mon Jul 28 17:25:54 2014 +0300
tree 9b692d77852b4fcbbb0d1ba05fdf2f6ded9a2146
parent 9d0640a77089ae49be811940be1c7d8aa2c19cb2

Add Text/DropDown null check in AutoSuggest property handlers

Text or DropDown could be disposed (undefined) when AutoSuggest performs
a set operation.

Change-Id: I2fd4be9367a815bf90cab1db2665c5c9ee65ce1c
Signed-off-by: Ivan Furnadjiev <ivan@eclipsesource.com>

bundles/org.eclipse.rap.addons.autosuggest/src/org/eclipse/rap/addons/autosuggest/internal/resources/AutoSuggest.js

diff --git a/bundles/org.eclipse.rap.addons.autosuggest/src/org/eclipse/rap/addons/autosuggest/internal/resources/AutoSuggest.js b/bundles/org.eclipse.rap.addons.autosuggest/src/org/eclipse/rap/addons/autosuggest/internal/resources/AutoSuggest.js
index 1f51771..2365303 100644
--- a/bundles/org.eclipse.rap.addons.autosuggest/src/org/eclipse/rap/addons/autosuggest/internal/resources/AutoSuggest.js
+++ b/bundles/org.eclipse.rap.addons.autosuggest/src/org/eclipse/rap/addons/autosuggest/internal/resources/AutoSuggest.js
@@ -30,14 +30,11 @@
 }
 
 function handleModelEvent( model, event ) {
-  var textWidget;
-  try {
-    textWidget = rap.getObject( model.get( "textWidgetId" ) );
-  } catch( ex ) {
-    // When Text is disposed, AutoSuggest may perform a set operation before it is also disposed
-    return;
-  }
+  var textWidget = rap.getObject( model.get( "textWidgetId" ) );
   var dropDown = rap.getObject( model.get( "dropDownWidgetId" ) );
+  // Note: Text or DropDown could be disposed (undefined) at this point.
+  // AutoSuggest may perform a set operation before it is also disposed.
+  // Add null check in the corresponding property handler.
   if( event.type === "accept" ) {
     onAcceptSuggestion.apply( model, [ event ] );
   } else {
@@ -117,7 +114,7 @@
 }
 
 function syncModelSuggestionsVisible( dropDown, event ) {
-  if( event.options.action !== "sync" ) {
+  if( dropDown && event.options.action !== "sync" ) {
     dropDown.setVisible( event.value );
   }
 }
@@ -131,17 +128,21 @@
 }
 
 function syncModelCurrentSuggestionTexts( dropDown, event ) {
-  dropDown.setItems( this.get( "currentSuggestionTexts" ) );
+  if( dropDown ) {
+    dropDown.setItems( this.get( "currentSuggestionTexts" ) );
+  }
 }
 
 function syncModelText( textWidget, event ) {
-  if( event.options.action !== "sync" ) {
+  if( textWidget && event.options.action !== "sync" ) {
     textWidget.setText( event.value );
   }
 }
 
 function syncModelTextSelection( textWidget, event ) {
-  textWidget.setSelection( event.value );
+  if( textWidget ) {
+    textWidget.setSelection( event.value );
+  }
 }
 
 //////////////////