From e5bb3e2f0aebacbd2f3a2b841f777c3e0076778a Mon Sep 17 00:00:00 2001
From: catbref <misc-github@talk2dom.com>
Date: Sun, 17 Jan 2021 15:34:50 +0000
Subject: [PATCH] Added defensive try-catch around network engine calls
 (actually ExecuteProduceConsume)

---
 .../qortal/utils/ExecuteProduceConsume.java   | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/qortal/utils/ExecuteProduceConsume.java b/src/main/java/org/qortal/utils/ExecuteProduceConsume.java
index 334322bb..c639d364 100644
--- a/src/main/java/org/qortal/utils/ExecuteProduceConsume.java
+++ b/src/main/java/org/qortal/utils/ExecuteProduceConsume.java
@@ -125,8 +125,8 @@ public abstract class ExecuteProduceConsume implements Runnable {
 			// It's possible this might need to become a class instance private volatile
 			boolean canBlock = false;
 
-			while (true) {
-				final Task task;
+			while (!Thread.currentThread().isInterrupted()) {
+				Task task = null;
 
 				this.logger.trace(() -> String.format("[%d] waiting to produce...", Thread.currentThread().getId()));
 
@@ -142,7 +142,16 @@ public abstract class ExecuteProduceConsume implements Runnable {
 							Thread.currentThread().getId(), this.activeThreadCount, this.consumerCount, lambdaCanIdle));
 
 					final long beforeProduce = isLoggerTraceEnabled ? System.currentTimeMillis() : 0;
-					task = produceTask(canBlock);
+
+					try {
+						task = produceTask(canBlock);
+					} catch (InterruptedException e) {
+						// We're in shutdown situation so exit
+						Thread.currentThread().interrupt();
+					} catch (Exception e) {
+						this.logger.warn(() -> String.format("[%d] exception while trying to produce task", Thread.currentThread().getId()), e);
+					}
+
 					this.logger.trace(() -> String.format("[%d] producing took %dms", Thread.currentThread().getId(), System.currentTimeMillis() - beforeProduce));
 				}
 
@@ -155,7 +164,8 @@ public abstract class ExecuteProduceConsume implements Runnable {
 							--this.activeThreadCount;
 							this.logger.trace(() -> String.format("[%d] ending, activeThreadCount now: %d",
 									Thread.currentThread().getId(), this.activeThreadCount));
-							break;
+
+							return;
 						}
 
 						// We're the last surviving thread - producer can afford to block next round
@@ -192,7 +202,16 @@ public abstract class ExecuteProduceConsume implements Runnable {
 				}
 
 				this.logger.trace(() -> String.format("[%d] performing task...", Thread.currentThread().getId()));
-				task.perform(); // This can block for a while
+
+				try {
+					task.perform(); // This can block for a while
+				} catch (InterruptedException e) {
+					// We're in shutdown situation so exit
+					Thread.currentThread().interrupt();
+				} catch (Exception e) {
+					this.logger.warn(() -> String.format("[%d] exception while performing task", Thread.currentThread().getId()), e);
+				}
+
 				this.logger.trace(() -> String.format("[%d] finished task", Thread.currentThread().getId()));
 
 				synchronized (this) {
@@ -206,8 +225,6 @@ public abstract class ExecuteProduceConsume implements Runnable {
 					canBlock = false;
 				}
 			}
-		} catch (InterruptedException e) {
-			// We're in shutdown situation so exit
 		} finally {
 			if (this.isLoggerTraceEnabled)
 				Thread.currentThread().setName(this.className);