xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2758 Fix MHSEmulator to pass small files" into development

Browse source 
Former-commit-id: 9c9696faaf [formerly fc5aa71b86] [formerly a860ff3e6e] [formerly 9c9696faaf [formerly fc5aa71b86] [formerly a860ff3e6e] [formerly 7ab79d8b3a [formerly a860ff3e6e [formerly ecece1009e1508451569b3d065e30820819a0502]]]]
Former-commit-id: 7ab79d8b3a
Former-commit-id: 317494f1c6 [formerly 5c08871d87] [formerly 166d8ede7f13b683cc58ee2b374e79c43e5d001d [formerly 33adfffab9]]
Former-commit-id: 6dffac05657e4e375e85abee7e3a35b7b37ffeb3 [formerly 97e125cbd2]
Former-commit-id: f82e2401da
This commit is contained in:
Ron Anderson 2014-02-18 12:12:25 -06:00 • committed by Gerrit Code Review
commit c96863f1ef
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
MHSEmulator/src/mhs/core/SocketSrv.java
View file

@ -207,7 +207,7 @@ public class SocketSrv {
message = getMessage(in);
if (message.length < 50) {
if (!flag.equals("-file")) {
String strMessage = new String(message);
if (strMessage.equals(MhsUtil.END_TOKEN)) {
log("Disconnected from client: " + client);
@ -228,6 +228,7 @@ public class SocketSrv {
log("File Received of size: " + message.length);
files.add(writeToFile(myMHS + "-" + params.get("-MSGID"),
message));
flag = "";
}
}
}
@ -271,7 +272,7 @@ public class SocketSrv {
String fileList = "";
for (int i = 0; i < files.size(); i++) {
fileList += files.get(i);
if (i != files.size() - 1) {
if (i != (files.size() - 1)) {
fileList += ",";
}
}