src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 23,44 ****
   * questions.
   */
  
  package com.sun.beans.introspect;
  
- import com.sun.beans.TypeResolver;
- import com.sun.beans.finder.MethodFinder;
- 
  import java.lang.reflect.Method;
  import java.lang.reflect.Modifier;
  import java.lang.reflect.Type;
  import java.util.ArrayList;
- import java.util.Arrays;
  import java.util.Collections;
  import java.util.Comparator;
  import java.util.List;
  
  final class MethodInfo {
      final Method method;
      final Class<?> type;
  
      MethodInfo(Method method, Class<?> type) {
--- 23,43 ----
   * questions.
   */
  
  package com.sun.beans.introspect;
  
  import java.lang.reflect.Method;
  import java.lang.reflect.Modifier;
  import java.lang.reflect.Type;
  import java.util.ArrayList;
  import java.util.Collections;
  import java.util.Comparator;
  import java.util.List;
  
+ import com.sun.beans.TypeResolver;
+ import com.sun.beans.finder.MethodFinder;
+ 
  final class MethodInfo {
      final Method method;
      final Class<?> type;
  
      MethodInfo(Method method, Class<?> type) {
*** 139,149 ****
--- 138,151 ----
  
              // Super type comes last: Integer, Number, Object
              if (aret.isAssignableFrom(bret)) {
                  return 1;
              }
+             if (bret.isAssignableFrom(aret)) {
                  return -1;
              }
+             return aret.getName().compareTo(bret.getName());
+         }
  
          static final MethodOrder instance = new MethodOrder();
      }
  }