jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java

rev 5725 : Merge

*** 64,78 ****
          }
          PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);
          Signature signature = new Signature(type, name, args);
  
          Method method = CACHE.get(signature);
!         if (method != null) {
              return method;
          }
          method = findAccessibleMethod(new MethodFinder(name, args).find(type.getMethods()));
          CACHE.put(signature, method);
          return method;
      }
  
      /**
       * Finds public non-static method
--- 64,81 ----
          }
          PrimitiveWrapperMap.replacePrimitivesWithWrappers(args);
          Signature signature = new Signature(type, name, args);
  
          Method method = CACHE.get(signature);
!         boolean cached = method != null;
!         if (cached && isPackageAccessible(method.getDeclaringClass())) {
              return method;
          }
          method = findAccessibleMethod(new MethodFinder(name, args).find(type.getMethods()));
+         if (!cached) {
              CACHE.put(signature, method);
+         }
          return method;
      }
  
      /**
       * Finds public non-static method