perfsonar development work

Author: nina
Date: 2008-10-13 06:27:26 -0400 (Mon, 13 Oct 2008)
New Revision: 4607

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserDataComparator.java
Log:
Fix for https://bugzilla.perfsonar.net/show_bug.cgi?id=577  

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserDataComparator.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserDataComparator.java 
      2008-10-10 10:17:22 UTC (rev 4606)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserDataComparator.java 
      2008-10-13 10:27:26 UTC (rev 4607)
@@ -116,15 +116,23 @@
        try {
                        d1 = Double.parseDouble(o1.getResponse(index));
        } catch (Exception x) {
-            
-               return 1;
+            d1 = Double.NaN;
        }
        try {
                        d2 = Double.parseDouble(o2.getResponse(index));
-                       if (d1>d2) return -1; else if (d1 == d2) return 0; 
else return 1;
        } catch (Exception x) {
-               return -1;
-       }       
+               d2 = Double.NaN;
+       }
+       if (Double.isNaN(d1))
+               if (Double.isNaN(d2))
+                       return 0;
+               else
+                       return 1;
+       else
+               if (Double.isNaN(d2))
+                       return -1;
+               else
+                       if (d1>d2) return -1; else if (d1 == d2) return 0; 
else return 1;
     }
 
     /* (non-Javadoc)