git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
StringUtils: NPE fix if bad arg for padding, tests
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
server
/
ServerString.java
diff --git
a/src/be/nikiroo/utils/serial/server/ServerString.java
b/src/be/nikiroo/utils/serial/server/ServerString.java
index 4a185da50baf3ae03190a3e0d3b64c09bbbf285c..c19e0ae68077a73841f6581999fa89e88967bd8c 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/
src/be/nikiroo/utils/serial/server/ServerString.java
@@
-56,36
+56,25
@@
abstract public class ServerString extends Server {
return new ConnectActionServerString(s) {
@Override
public void action(Version clientVersion) throws Exception {
return new ConnectActionServerString(s) {
@Override
public void action(Version clientVersion) throws Exception {
- try {
- for (String data = rec(); data != null; data = rec()) {
- String rep = null;
- try {
- rep = onRequest(this, clientVersion, data);
- } catch (Exception e) {
- onError(e);
- }
-
- if (rep == null) {
- rep = "";
- }
+ for (String data = rec(); data != null; data = rec()) {
+ String rep = null;
+ try {
+ rep = onRequest(this, clientVersion, data);
+ } catch (Exception e) {
+ onError(e);
+ }
- send(rep);
+ if (rep == null) {
+ rep = "";
}
}
- } catch (NullPointerException e) {
- // Client has no data any more, we quit
- getTraceHandler()
- .trace(getName()
- + ": client has data no more, stopping connection");
+
+ send(rep);
}
}
@Override
}
}
@Override
- public void connect() {
- try {
- super.connect();
- } finally {
- count(-1);
- }
+ protected void onError(Exception e) {
+ ServerString.this.onError(e);
}
};
}
}
};
}