changeset 5473:57ae0cc82515

Merge
author asaha
date Tue, 11 Sep 2012 12:41:01 -0700
parents 354650f9cddc 540a5994d0ff
children 0e2200a8762c
files .hgtags src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java src/share/classes/java/awt/EventQueue.java src/share/classes/sun/awt/AWTAccessor.java
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Sep 11 14:45:22 2012 +0100
+++ b/.hgtags	Tue Sep 11 12:41:01 2012 -0700
@@ -199,5 +199,9 @@
 0ae89e53f5300da1961984a7d81c220c7cf717d7 jdk7u6-b23
 1c775da998735711853cfe1ae1d6baddc5f12a66 jdk7u6-b24
 4bd0528374971157afd6372890f4250e1cf712d9 jdk7u6-b30
+78e01a6ca8d30e8fc4eb297d297a098edfb3fec6 jdk7u7-b10
+9666d4e4bbf3f80614e246d5c15df86154544013 jdk7u7-b30
+94154c14973aee7c5ff4846af7bcb71fe7a82fa5 jdk7u7-b11
+f93d2e3b2610b612401c95dd56d1a1122d35f676 jdk7u7-b31
 94a7d51992ae6fd31f9adc15c4976d6354dca14d jdk7u7-b01
 901c290c9c8b495a2696f10a87523363239d001b jdk7u7-b02
--- a/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java	Tue Sep 11 14:45:22 2012 +0100
+++ b/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java	Tue Sep 11 12:41:01 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, 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
@@ -28,6 +28,8 @@
 
 import java.lang.reflect.Method;
 
+import sun.reflect.misc.MethodUtil;
+
 /**
  * This class is intended to handle <method> element.
  * It describes invocation of the method.
@@ -101,7 +103,7 @@
         if (method.isVarArgs()) {
             args = getArguments(args, method.getParameterTypes());
         }
-        Object value = method.invoke(bean, args);
+        Object value = MethodUtil.invoke(method, bean, args);
         return method.getReturnType().equals(void.class)
                 ? ValueObjectImpl.VOID
                 : ValueObjectImpl.create(value);