Updated Branches: refs/heads/develop 51e3cc94e -> 9a51699c1
FLEX-25369 stop RTE when sorting complex columns with null values Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/9a51699c Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/9a51699c Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/9a51699c Branch: refs/heads/develop Commit: 9a51699c1398e4ebc38f005919885e27b9ba00f3 Parents: 51e3cc9 Author: Justin Mclean <jmcl...@apache.org> Authored: Fri Sep 13 10:17:20 2013 +1000 Committer: Justin Mclean <jmcl...@apache.org> Committed: Fri Sep 13 10:17:20 2013 +1000 ---------------------------------------------------------------------- .../mx/src/mx/controls/dataGridClasses/DataGridColumn.as | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9a51699c/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as index 41052b0..a053c04 100644 --- a/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as +++ b/frameworks/projects/mx/src/mx/controls/dataGridClasses/DataGridColumn.as @@ -1833,11 +1833,11 @@ public class DataGridColumn extends CSSStyleDeclaration implements IIMESupport var currentRef:Object = data; if ( complexFieldNameComponents ) { - for ( var i:int=0; i<complexFieldNameComponents.length; i++ ) + for ( var i:int=0; currentRef && i < complexFieldNameComponents.length; i++ ) currentRef = currentRef[ complexFieldNameComponents[ i ] ]; } - return currentRef; + return currentRef?currentRef:""; } /**
