Skip to content

fix skip jvm invoke #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caojie09 merged 1 commit into from
Oct 28, 2019
Merged

fix skip jvm invoke #511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions ...-sofa-boot/src/main/java/com/alipay/sofa/runtime/invoke/DynamicJvmServiceProxyFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,6 @@ public DynamicJvmServiceInvoker(ClassLoader clientClassloader,
@Override
protected Object doInvoke(MethodInvocation invocation) throws Throwable {
try {
Method targetMethod = invocation.getMethod();
Object[] targetArguments = invocation.getArguments();

SofaLogger
.debug(">> Start in Cross App JVM service invoke, the service interface is - "
+ getInterfaceType());
Expand All @@ -191,16 +188,8 @@ protected Object doInvoke(MethodInvocation invocation) throws Throwable {
ReplayContext.setPlaceHolder();
}

// check whether skip serialize or not
if (!serialize || SofaRuntimeProperties.isSkipJvmSerialize(clientClassloader.get())) {
ClassLoader tcl = Thread.currentThread().getContextClassLoader();
try {
pushThreadContextClassLoader(getServiceClassLoader());
return targetMethod.invoke(targetService, targetArguments);
} finally {
pushThreadContextClassLoader(tcl);
}
}
Method targetMethod = invocation.getMethod();
Object[] targetArguments = invocation.getArguments();

if (TOSTRING_METHOD.equalsIgnoreCase(targetMethod.getName())
&& targetMethod.getParameterTypes().length == 0) {
Expand All @@ -214,14 +203,24 @@ protected Object doInvoke(MethodInvocation invocation) throws Throwable {
}

Class[] oldArgumentTypes = targetMethod.getParameterTypes();

final Object[] arguments = (Object[]) hessianTransport(targetArguments, null);
final Class[] argumentTypes = (Class[]) hessianTransport(oldArgumentTypes, null);

Method transformMethod = getTargetMethod(targetMethod, argumentTypes);
Object retVal = transformMethod.invoke(targetService, arguments);

return hessianTransport(retVal, getClientClassloader());
Method transformMethod;
// check whether skip serialize or not
if (!serialize || SofaRuntimeProperties.isSkipJvmSerialize(clientClassloader.get())) {
ClassLoader tcl = Thread.currentThread().getContextClassLoader();
try {
pushThreadContextClassLoader(getServiceClassLoader());
transformMethod = getTargetMethod(targetMethod, oldArgumentTypes);
return transformMethod.invoke(targetService, targetArguments);
} finally {
pushThreadContextClassLoader(tcl);
}
} else {
Object[] arguments = (Object[]) hessianTransport(targetArguments, null);
Class[] argumentTypes = (Class[]) hessianTransport(oldArgumentTypes, null);
transformMethod = getTargetMethod(targetMethod, argumentTypes);
Object retVal = transformMethod.invoke(targetService, arguments);
return hessianTransport(retVal, getClientClassloader());
}
} catch (InvocationTargetException ex) {
throw ex.getTargetException();
} finally {
Expand Down