MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix return RMI types 2

Browse Source
This commit is contained in:
Gregory.Shrago
2012-08-13 22:10:07 +04:00
parent adb5612fd4
commit 38f46b04c3
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/execution/rmi/RemoteUtil.java
+4 -16
View File
@@ -114,8 +114,8 @@ public class RemoteUtil {
}, classLoader);
}
public static <T> T handleRemoteResult(Object value, Object requestor) throws Exception {
return RemoteUtil.<T>handleRemoteResult(value, Object.class, requestor.getClass().getClassLoader(), false);
public static <T> T handleRemoteResult(Object value, Class<T> clazz, Object requestor) throws Exception {
return RemoteUtil.<T>handleRemoteResult(value, clazz, requestor.getClass().getClassLoader(), false);
}
private static <T> T handleRemoteResult(Object value, Class<?> methodReturnType, ClassLoader classLoader, boolean substituteClassLoader) throws Exception {
@@ -128,20 +128,8 @@ public class RemoteUtil {
result = substituteClassLoader? substituteClassLoader(value, classLoader) : value;
}
}
else if (value instanceof Collection) {
Collection c = (Collection)value;
if (value instanceof Set) {
LinkedHashSet set = new LinkedHashSet();
for (Object o : c) {
set.add(handleRemoteResult(o, Object.class, classLoader, substituteClassLoader));
}
result = set;
}
else {
result = Arrays.asList((Object[])handleRemoteResult(c.toArray(), Object.class, classLoader, substituteClassLoader));
}
else if (value instanceof List && methodReturnType.isInterface()) {
result = Arrays.asList((Object[])handleRemoteResult(((List)value).toArray(), Object.class, classLoader, substituteClassLoader));
}
else if (value instanceof Object[]) {
Object[] array = (Object[])value;