corrected bug with SpyPropertyDescriptorComparator

src/fr/ill/ics/nscclient/dataprovider/PropertyDatabase.java

@@ -110,13 +110,11 @@ public class PropertyDatabase {
 			Set<SpyPropertyDescriptor> set = new TreeSet<SpyPropertyDescriptor>(new SpyPropertyDescriptorComparator());
 			spyPropertiesByServant.put(servantId, set);
 		} 
+		
 		spyPropertiesByServant.get(servantId).add(descriptor);
-
-//		if (descriptor.getSetpointID() != 0) {
-//			System.out.println("spy property for servant " + servantId);
-//			System.out.println(descriptor);
-//		}
-	
+		
+//		System.out.println("spy property for servant " + servantId);
+//		System.out.println(descriptor);
 	}
 	
 	/**

src/fr/ill/ics/nscclient/servant/SpyPropertyDescriptorComparator.java

@@ -28,9 +28,9 @@ public class SpyPropertyDescriptorComparator implements Comparator<SpyPropertyDe
 		
 		// first comparing set point ID before actual ID
 		if (d1.getSetpointID() == d2.getSetpointID()) {
-			return Integer.compare(d1.getActualID(), d1.getActualID());
+			return Integer.compare(d1.getActualID(), d2.getActualID());
 		}
-		
+				
 		return Integer.compare(d1.getSetpointID(), d2.getSetpointID());
 	}