From 0ff71477abf90d4843b8d9a3dc9907b5edc95fc0 Mon Sep 17 00:00:00 2001
From: Niki Roo <niki@nikiroo.be>
Date: Wed, 29 Nov 2017 23:27:36 +0100
Subject: [PATCH] Version 3.1.4: error handling for traces in Server

---
 VERSION                                              | 2 +-
 changelog.md                                         | 4 ++++
 src/be/nikiroo/utils/serial/server/ServerBridge.java | 5 +++++
 src/be/nikiroo/utils/serial/server/ServerObject.java | 5 +++++
 src/be/nikiroo/utils/serial/server/ServerString.java | 5 +++++
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index ff365e0..0aec50e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.3
+3.1.4
diff --git a/changelog.md b/changelog.md
index 810d0e1..f762aac 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # nikiroo-utils
 
+## Version 3.1.4
+
+- Fix error handling for tracers in Server
+
 ## Version 3.1.3
 
 - Fix ImageUtils.fromStream with non-resetable streams
diff --git a/src/be/nikiroo/utils/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java
index 251e75a..60312bb 100644
--- a/src/be/nikiroo/utils/serial/server/ServerBridge.java
+++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java
@@ -128,6 +128,11 @@ public class ServerBridge extends Server {
 							bridge.send(fromServer);
 						}
 					}
+
+					@Override
+					protected void onError(Exception e) {
+						getTraceHandler().error(e);
+					}
 				}.connect();
 			}
 		};
diff --git a/src/be/nikiroo/utils/serial/server/ServerObject.java b/src/be/nikiroo/utils/serial/server/ServerObject.java
index fdbd2cd..67dfa4a 100644
--- a/src/be/nikiroo/utils/serial/server/ServerObject.java
+++ b/src/be/nikiroo/utils/serial/server/ServerObject.java
@@ -70,6 +70,11 @@ abstract public class ServerObject extends Server {
 					// Client has no data any more, we quit
 				}
 			}
+
+			@Override
+			protected void onError(Exception e) {
+				getTraceHandler().error(e);
+			}
 		};
 	}
 
diff --git a/src/be/nikiroo/utils/serial/server/ServerString.java b/src/be/nikiroo/utils/serial/server/ServerString.java
index 186afa0..7843681 100644
--- a/src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/src/be/nikiroo/utils/serial/server/ServerString.java
@@ -71,6 +71,11 @@ abstract public class ServerString extends Server {
 					send(rep);
 				}
 			}
+
+			@Override
+			protected void onError(Exception e) {
+				getTraceHandler().error(e);
+			}
 		};
 	}
 
-- 
2.27.0