Skip to content

Fix class loader checks fallback #224

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix class loader checks fallback #224

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
7 changes: 6 additions & 1 deletion src/dorkbox/systemTray/util/SystemTrayFixes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@ boolean isSwingTrayLoaded(String className) {
try {
ClassLoader cl = ClassLoader.getSystemClassLoader();
// if we are using swing, the classes are already created. We cannot fix things when it's already loaded.
return ClassUtils.isClassLoaded(cl, className) || ClassUtils.isClassLoaded(cl, "java.awt.SystemTray");

try {
return ClassUtils.isClassLoaded(cl, className);
} catch (Throwable e) {
return ClassUtils.isClassLoaded(cl, "java.awt.SystemTray");
}
} catch (Throwable e) {
if (SystemTray.DEBUG) {
logger.debug("Error detecting if the Swing SystemTray is loaded, unexpected error.", e);
Expand Down