src/share/classes/java/beans/Introspector.java

*** 1382,1392 ****
      /**
       * Internal support for finding a target methodName with a given
       * parameter list on a given class.
       */
      private static Method internalFindMethod(Class<?> start, String methodName,
!                                                  int argCount, Class args[]) {
          // For overriden methods we need to find the most derived version.
          // So we start with the given class and walk up the superclass chain.
  
          Method method = null;
  
--- 1382,1392 ----
      /**
       * Internal support for finding a target methodName with a given
       * parameter list on a given class.
       */
      private static Method internalFindMethod(Class<?> start, String methodName,
!                                                  int argCount, Class<?> args[]) {
          // For overriden methods we need to find the most derived version.
          // So we start with the given class and walk up the superclass chain.
  
          Method method = null;
  
*** 1424,1434 ****
          method = null;
  
          // Now check any inherited interfaces.  This is necessary both when
          // the argument class is itself an interface, and when the argument
          // class is an abstract class.
!         Class ifcs[] = start.getInterfaces();
          for (int i = 0 ; i < ifcs.length; i++) {
              // Note: The original implementation had both methods calling
              // the 3 arg method. This is preserved but perhaps it should
              // pass the args array instead of null.
              method = internalFindMethod(ifcs[i], methodName, argCount, null);
--- 1424,1434 ----
          method = null;
  
          // Now check any inherited interfaces.  This is necessary both when
          // the argument class is itself an interface, and when the argument
          // class is an abstract class.
!         Class<?>[] ifcs = start.getInterfaces();
          for (int i = 0 ; i < ifcs.length; i++) {
              // Note: The original implementation had both methods calling
              // the 3 arg method. This is preserved but perhaps it should
              // pass the args array instead of null.
              method = internalFindMethod(ifcs[i], methodName, argCount, null);
*** 1457,1467 ****
       * @param argCount Number of arguments for the desired method.
       * @param args Array of argument types for the method.
       * @return the method or null if not found
       */
      static Method findMethod(Class<?> cls, String methodName, int argCount,
!                              Class args[]) {
          if (methodName == null) {
              return null;
          }
          return internalFindMethod(cls, methodName, argCount, args);
      }
--- 1457,1467 ----
       * @param argCount Number of arguments for the desired method.
       * @param args Array of argument types for the method.
       * @return the method or null if not found
       */
      static Method findMethod(Class<?> cls, String methodName, int argCount,
!                              Class<?>[] args) {
          if (methodName == null) {
              return null;
          }
          return internalFindMethod(cls, methodName, argCount, args);
      }
*** 1500,1510 ****
  
      /**
       * Return true iff the given method throws the given exception.
       */
      private boolean throwsException(Method method, Class<?> exception) {
!         Class exs[] = method.getExceptionTypes();
          for (int i = 0; i < exs.length; i++) {
              if (exs[i] == exception) {
                  return true;
              }
          }
--- 1500,1510 ----
  
      /**
       * Return true iff the given method throws the given exception.
       */
      private boolean throwsException(Method method, Class<?> exception) {
!         Class<?>[] exs = method.getExceptionTypes();
          for (int i = 0; i < exs.length; i++) {
              if (exs[i] == exception) {
                  return true;
              }
          }