Skip to content
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.

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

Update ClassUtils.java #88

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
17 changes: 6 additions & 11 deletions axelor-common/src/main/java/com/axelor/common/ClassUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ public static ClassLoader getDefaultClassLoader() {
ClassLoader loader = getContextClassLoader();
if (loader == null) {
loader = ClassUtils.class.getClassLoader();
}
if (loader == null) {
loader = ClassLoader.getSystemClassLoader();
if (loader == null) {
loader = ClassLoader.getSystemClassLoader();
}
}
return loader;
}
Expand Down Expand Up @@ -156,14 +156,9 @@ public static boolean isProxyClassName(String className) {
* @return the real super class of the given proxy class, or itself if it's not a proxy class
*/
public static <T> Class<? super T> getRealClass(Class<T> proxyClass) {
if (!isProxyClass(proxyClass)) {
return proxyClass;
}
Class<? super T> zuper = proxyClass.getSuperclass();
while (isProxyClass(zuper)) {
zuper = getRealClass(zuper);
}
return zuper;
return isProxyClass(proxyClass)
? getRealClass(proxyClass.getSuperclass())
: proxyClass;
}

/**
Expand Down