Changeset 2025

Timestamp:

02/13/2010 01:36:55 PM (6 months ago)

Author:

djb61

Message:

Fix a problem in diskselection which meant the last root in the scorechart would be used regardless of the actual scores associated with the roots, removed roots were still observed due to being removed from the list in the scorechart. It looks like this bug was introduced in [1884]
See: #268

Files:

• trunk/src/plugins/org.drftpd.slave.diskselection.filter/src/org/drftpd/slave/diskselection/filter/DiskSelectionFilter.java (modified) (1 diff)

trunk/src/plugins/org.drftpd.slave.diskselection.filter/src/org/drftpd/slave/diskselection/filter/DiskSelectionFilter.java

@@ -133 +133 @@
                 for (RootScore rs : sc.getScoreList()) {
                         long score = rs.getScore();
-                        //TODO check this!
-                        if (bestRoot != null && score > bestRoot.getScore()) {
+
+                        if (bestRoot == null) {
                                 bestRoot = rs;
-                        } else {
+                        } else if (score > bestRoot.getScore()) {
                                 bestRoot = rs;
                         }