git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4b7d32e
)
Version 3.1.4: error handling for traces in Server
nikiroo-utils-3.1.4
author
Niki Roo
<niki@nikiroo.be>
Wed, 29 Nov 2017 22:27:36 +0000
(23:27 +0100)
committer
Niki Roo
<niki@nikiroo.be>
Wed, 29 Nov 2017 22:27:36 +0000
(23:27 +0100)
VERSION
patch
|
blob
|
blame
|
history
changelog.md
patch
|
blob
|
blame
|
history
src/be/nikiroo/utils/serial/server/ServerBridge.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/utils/serial/server/ServerObject.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/utils/serial/server/ServerString.java
patch
|
blob
|
blame
|
history
diff --git
a/VERSION
b/VERSION
index ff365e06b9577c96dfeadddb8c4cccb09b85665c..0aec50e6ede78cfcb00d159fc0932ce35a80cb87 100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-3.1.
3
+3.1.
4
diff --git
a/changelog.md
b/changelog.md
index 810d0e19463e310950dc4fe66af9a71be8d6048f..f762aac195c7bc7fe084eeaf2f80dc271d111ce2 100644
(file)
--- a/
changelog.md
+++ b/
changelog.md
@@
-1,5
+1,9
@@
# nikiroo-utils
# nikiroo-utils
+## Version 3.1.4
+
+- Fix error handling for tracers in Server
+
## Version 3.1.3
- Fix ImageUtils.fromStream with non-resetable streams
## 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 251e75a99a9cdb10d1b282a90cd4c9940a326aef..60312bbe2dc4d0285f85feb79202c6372f2c1cbe 100644
(file)
--- 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);
}
}
bridge.send(fromServer);
}
}
+
+ @Override
+ protected void onError(Exception e) {
+ getTraceHandler().error(e);
+ }
}.connect();
}
};
}.connect();
}
};
diff --git
a/src/be/nikiroo/utils/serial/server/ServerObject.java
b/src/be/nikiroo/utils/serial/server/ServerObject.java
index fdbd2cd4d93fe2bcb2b14fa6e44d9814e27c6400..67dfa4a020d3a0cb8f8a70446298ddb7e0b0f7ee 100644
(file)
--- 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
}
}
// 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 186afa07ed6d2c85f94e7e2db1d7f5dfd601efc5..78436813f584a1220c6bf478f3f567a072e15b24 100644
(file)
--- 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);
}
}
send(rep);
}
}
+
+ @Override
+ protected void onError(Exception e) {
+ getTraceHandler().error(e);
+ }
};
}
};
}