Revision 580478e1 web_client/src/gr/grnet/pithos/web/client/FileList.java

b/web_client/src/gr/grnet/pithos/web/client/FileList.java
297 297 
        aColumn = new Column<File,String>(new TextCell()) {
298 298 
			@Override
299 299 
			public String getValue(File object) {
300 
				return formatter.format(object.getLastModified());
300 
				return object.getLastModified() != null ? formatter.format(object.getLastModified()) : "";
301 301 
			}
302 302 
		};
303 303 
        aheader = new SortableHeader("Last Modified");
......
500 500 
                            } else if (sortingProperty.equals("owner")) {
501 501 
                                    return arg0.getOwner().compareTo(arg1.getOwner());
502 502 
                            } else if (sortingProperty.equals("date")) {
503 
                                    return arg0.getLastModified().compareTo(arg1.getLastModified());
503 
                            		if (arg0.getLastModified() != null && arg1.getLastModified() != null)
504 
                            			return arg0.getLastModified().compareTo(arg1.getLastModified());
505 
                            		return 0;
504 506 
                            } else if (sortingProperty.equals("size")) {
505 507 
                                    return (int) (arg0.getBytes() - arg1.getBytes());
506 508 
                            } else if (sortingProperty.equals("name")) {

Also available in: Unified diff