[richfaces-svn-commits] JBoss Rich Faces SVN: r10302 - trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort.

Author: konstantin.mishin Date: 2008-09-03 12:43:44 -0400 (Wed, 03 Sep 2008) New Revision: 10302 Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java Log: RF-4368 Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2008-09-03 15:50:45 UTC (rev 10301) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2008-09-03 16:43:44 UTC (rev 10302) @@ -36,7 +36,10 @@ UIScrollableDataTable grid = (UIScrollableDataTable) e.getComponent(); //fix https://jira.jboss.org/jira/browse/RF-4368 - ((SimpleSelection) grid.getSelection()).clear(); + SimpleSelection selection = (SimpleSelection) grid.getSelection(); + if (selection != null) { + selection.clear(); + } String sortColumn = e.getSortColumn(); Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java 2008-09-03 15:50:45 UTC (rev 10301) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java 2008-09-03 16:43:44 UTC (rev 10302) @@ -30,7 +30,10 @@ UIScrollableDataTable grid = (UIScrollableDataTable) e.getComponent(); //fix https://jira.jboss.org/jira/browse/RF-4368 - ((SimpleSelection) grid.getSelection()).clear(); + SimpleSelection selection = (SimpleSelection) grid.getSelection(); + if (selection != null) { + selection.clear(); + } String sortColumn = e.getSortColumn();