Merged V1.3 to HEAD (3064:3067)

svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3064 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3067 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-07-18 15:28:12 +00:00
parent 1147bcf949
commit 383c8028a0
5 changed files with 58 additions and 6 deletions

View File

@@ -65,7 +65,7 @@ public class UISortLink extends UICommand
boolean bPreviouslySorted = false;
boolean descending = true;
String lastSortedColumn = dataContainer.getCurrentSortColumn();
if (lastSortedColumn.equals(getValue()))
if (lastSortedColumn != null && lastSortedColumn.equals(getValue()))
{
descending = !dataContainer.isCurrentSortDescending();
bPreviouslySorted = true;