Followup to 1.5 compat changes

Author: peterdettman

tls/src/main/java/org/bouncycastle/jsse/provider/ProvX509KeyManager.java

@@ -880,16 +880,18 @@ private static final class Match
 
         public int compareTo(Match that)
         {
-            int cmp = Boolean.compare(that.isValid(), this.isValid());
-            if (cmp == 0)
+            boolean thisValid = this.isValid(), thatValid = that.isValid();
+            if (thisValid != thatValid)
             {
-                cmp = Integer.compare(this.keyTypeIndex, that.keyTypeIndex);
-                if (cmp == 0)
-                {
-                    cmp = this.quality.compareTo(that.quality);
-                }
+                return thisValid ? -1 : 1;
+            }
+
+            if (this.keyTypeIndex != that.keyTypeIndex)
+            {
+                return this.keyTypeIndex < that.keyTypeIndex ? -1 : 1;
             }
-            return cmp;
+
+            return this.quality.compareTo(that.quality);
         }
 
         boolean isIdeal()

tls/src/main/java/org/bouncycastle/jsse/provider/ProvX509KeyManagerSimple.java

@@ -362,16 +362,18 @@ private static final class Match
 
         public int compareTo(Match that)
         {
-            int cmp = (that.isValid() == this.isValid()) ? 0 : (that.isValid() ? 1 : -1);
-            if (cmp == 0)
+            boolean thisValid = this.isValid(), thatValid = that.isValid();
+            if (thisValid != thatValid)
             {
-                cmp = this.keyTypeIndex < that.keyTypeIndex ? -1 : (this.keyTypeIndex == that.keyTypeIndex ? 0 : 1);
-                if (cmp == 0)
-                {
-                    cmp = this.quality.compareTo(that.quality);
-                }
+                return thisValid ? -1 : 1;
+            }
+
+            if (this.keyTypeIndex != that.keyTypeIndex)
+            {
+                return this.keyTypeIndex < that.keyTypeIndex ? -1 : 1;
             }
-            return cmp;
+
+            return this.quality.compareTo(that.quality);
         }
 
         boolean isIdeal()