From c77ec0bd105756d4d9f1d02ed1bdc506f277bb3e Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 21 Sep 2020 11:04:35 +0200 Subject: [PATCH] Prevent crash --- app/src/main/java/javax/mail/EventQueue.java | 13 ++++++++++++ patches/JavaMail.patch | 22 ++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/app/src/main/java/javax/mail/EventQueue.java b/app/src/main/java/javax/mail/EventQueue.java index 618f872c8e..6ecacd09a2 100644 --- a/app/src/main/java/javax/mail/EventQueue.java +++ b/app/src/main/java/javax/mail/EventQueue.java @@ -154,6 +154,19 @@ class EventQueue implements Runnable { } } catch (InterruptedException e) { // just die + } catch (Error ex) { + /* + java.lang.Error: java.lang.InterruptedException + at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1173) + at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641) + at java.lang.Thread.run(Thread.java:919) + Caused by: java.lang.InterruptedException + at java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireInterruptibly(AbstractQueuedSynchronizer.java:1248) + at java.util.concurrent.locks.ReentrantLock.lockInterruptibly(ReentrantLock.java:344) + at java.util.concurrent.LinkedBlockingQueue.take(LinkedBlockingQueue.java:439) + at javax.mail.EventQueue.run(SourceFile:140) + at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167) + */ } } } diff --git a/patches/JavaMail.patch b/patches/JavaMail.patch index 58478c72cd..5ba501ff20 100644 --- a/patches/JavaMail.patch +++ b/patches/JavaMail.patch @@ -357,3 +357,25 @@ diff -rupN /home/marcel/JavaMail/mail/src/main/java/com/sun/mail/imap/protocol/I /** * The AUTHENTICATE command with AUTH=PLAIN authentication scheme. +--- /home/marcel/JavaMail/mail/src/main/java/javax/mail/EventQueue.java 2020-08-14 11:44:05.413359065 +0200 ++++ app/src/main/java/javax/mail/EventQueue.java 2020-09-21 11:04:19.648547947 +0200 +@@ -154,6 +154,19 @@ class EventQueue implements Runnable { + } + } catch (InterruptedException e) { + // just die ++ } catch (Error ex) { ++ /* ++ java.lang.Error: java.lang.InterruptedException ++ at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1173) ++ at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641) ++ at java.lang.Thread.run(Thread.java:919) ++ Caused by: java.lang.InterruptedException ++ at java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireInterruptibly(AbstractQueuedSynchronizer.java:1248) ++ at java.util.concurrent.locks.ReentrantLock.lockInterruptibly(ReentrantLock.java:344) ++ at java.util.concurrent.LinkedBlockingQueue.take(LinkedBlockingQueue.java:439) ++ at javax.mail.EventQueue.run(SourceFile:140) ++ at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167) ++ */ + } + } + }