From dcd7f10b58bac3cb176754b6896ba4bd7568bca1 Mon Sep 17 00:00:00 2001
From: sjm222 <sjm222@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 27 Jul 2010 22:18:36 +0000
Subject: [PATCH] merging in revision 5523, changing object property sort
 method to account for nulls

---
 .../vitro/webapp/beans/ObjectProperty.java    | 61 +++++++++++--------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
index ec4a4f144..f33e1d1fe 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
@@ -498,9 +498,20 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
                     int rv = 0;
                     try {
                         if( val1 instanceof String ) {
-                            Collator collator = Collator.getInstance();
-                        	rv = collator.compare( ((String)val1) , ((String)val2) );
-                            //rv = ((String)val1).compareTo((String)val2);
+                        	
+                        	if (val1 == null && val2 == null) {
+                        		rv = 0;
+                        	} else if (val1 == null) {
+                        		rv = 1;
+                        	} else if (val2 == null) {
+                        		rv = -1;
+                        	} else {
+                               	
+                                Collator collator = Collator.getInstance();
+                            	rv = collator.compare( ((String)val1) , ((String)val2) );
+                                //rv = ((String)val1).compareTo((String)val2);                 		
+                        	}
+ 
                         } else if( val1 instanceof Date ) {
                             DateTime dt1 = new DateTime((Date)val1);
                             DateTime dt2 = new DateTime((Date)val2);
@@ -580,33 +591,31 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
                         log.debug( "PropertyWebapp.sortObjectPropertyStatementsForDisplay passed object property statement with no range entity.");
                     }
                     int rv = 0;
-                    try {
-                        if (val1==null) {
-                            rv = 1;
+                    try {	
+                    	if (val1 == null && val2 == null) {
+                    		 rv = 0;
+                    	} else if (val1==null) {
+                             rv = 1;
+                        } else if (val2==null) {
+                             rv = -1;
+                        }  else {                        
+	                           if( val1 instanceof String ) {
+	                              Collator collator = Collator.getInstance();
+	                              rv = collator.compare( ((String)val1) , ((String)val2) ); //was rv = ((String)val1).compareTo((String)val2);
+	                           } else if( val1 instanceof Date ) {
+	                              DateTime dt1 = new DateTime((Date)val1);
+	                              DateTime dt2 = new DateTime((Date)val2);
+	                              rv = dt1.compareTo(dt2);
+	                           } else if( val1 instanceof Integer) {
+	                        	  rv = ((Integer) val1) - ((Integer) val2);
+	                           } else{
+	                            rv = 0;
+	                           }
                         }
-                        if (val2==null) {
-                            rv = -1;
-                        }
-                        if( val1 instanceof String ) {
-                            Collator collator = Collator.getInstance();
-                            rv = collator.compare( ((String)val1) , ((String)val2) ); //was rv = ((String)val1).compareTo((String)val2);
-                        } else if( val1 instanceof Date ) {
-                            DateTime dt1 = new DateTime((Date)val1);
-                            DateTime dt2 = new DateTime((Date)val2);
-                            rv = dt1.compareTo(dt2);
-                        } else if( val1 instanceof Integer) {
-                        	rv = ((Integer) val1) - ((Integer) val2);
-                        }
-                        else
-                            rv = 0;
                     } catch (NullPointerException e) {
                         e.printStackTrace();
                     }
-                    
-                    //if( cAscending )
-                    //    return rv;
-                    //else
-                    //    return rv * -1;
+ 
                     
                     if ( !cAscending ) {
                     	rv = rv * -1;