archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 12:34:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Lana Steuck 2012-08-31 12:11:03 -07:00
commit 6fc24809d4
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
jdk/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java
View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -28,6 +28,8 @@ import com.sun.beans.finder.MethodFinder;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import sun.reflect.misc.MethodUtil;
/** /**
* This class is intended to handle <method> element. * This class is intended to handle <method> element.
* It describes invocation of the method. * It describes invocation of the method.
@ -101,7 +103,7 @@ final class MethodElementHandler extends NewElementHandler {
if (method.isVarArgs()) { if (method.isVarArgs()) {
args = getArguments(args, method.getParameterTypes()); args = getArguments(args, method.getParameterTypes());
} }
Object value = method.invoke(bean, args); Object value = MethodUtil.invoke(method, bean, args);
return method.getReturnType().equals(void.class) return method.getReturnType().equals(void.class)
? ValueObjectImpl.VOID ? ValueObjectImpl.VOID
: ValueObjectImpl.create(value); : ValueObjectImpl.create(value);