From 1bf04355a46341328522e48c04bf323611007497 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 15 Jul 2010 18:52:03 +0000
Subject: [PATCH] User compareTo now handles null user names. NIHVIVO-827

---
 .../edu/cornell/mannlib/vitro/webapp/beans/User.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/User.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/User.java
index 1bdb4986b..6786b844e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/User.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/User.java
@@ -109,7 +109,15 @@ public class User implements Comparable {
 
     public int compareTo(Object o) {
         Collator collator = Collator.getInstance();
-        return collator.compare(this.getUsername(),((User)o).getUsername());
+        User other = ((User)o);
+        if( this.getUsername() == null && other.getUsername() == null )
+        	return 0;
+        else if( this.getUsername() == null )
+        	return -1;
+        else if( other.getUsername() == null)
+        	return 1;
+        else
+        	return collator.compare(this.getUsername(),((User)o).getUsername());
     }
 
 }