Pass in a ScheduledExecutorService and use it for who timers and reconnect timers. Only run the who timer when we're connected, not the whole time. This stops the Server ctor starting a timer. Change-Id: Iea92d7046f33eda7666b8a2b739374345e8ea20d Reviewed-on: http://gerrit.dmdirc.com/3419 Automatic-Compile: DMDirc Build Manager Reviewed-by: Greg Holmes <greg@dmdirc.com>pull/1/head
|
|
||
81 |
|
81 |
|
82 |
|
82 |
|
83 |
|
83 |
|
84 |
|
|
|
85 |
|
|
|
86 |
|
84 |
|
|
85 |
|
|
|
86 |
|
|
|
87 |
|
|
87 |
|
88 |
|
88 |
|
89 |
|
89 |
|
90 |
|
|
|
||
138 |
|
139 |
|
139 |
|
140 |
|
140 |
|
141 |
|
141 |
|
|
|
142 |
|
|
|
143 |
|
|
|
144 |
|
|
|
145 |
|
142 |
|
146 |
|
143 |
|
147 |
|
144 |
|
|
|
||
180 |
|
177 |
|
181 |
|
178 |
|
182 |
|
179 |
|
|
180 |
|
|
|
181 |
|
|
|
182 |
|
|
|
183 |
|
|
|
184 |
|
|
|
185 |
|
|
183 |
|
186 |
|
184 |
|
187 |
|
185 |
|
188 |
|
|
|
||
201 |
|
204 |
|
202 |
|
205 |
|
203 |
|
206 |
|
|
207 |
|
|
204 |
|
208 |
|
205 |
|
209 |
|
206 |
|
210 |
|
|
|
||
220 |
|
224 |
|
221 |
|
225 |
|
222 |
|
226 |
|
|
227 |
|
|
223 |
|
228 |
|
224 |
|
229 |
|
225 |
|
230 |
|
|
|
||
242 |
|
247 |
|
243 |
|
248 |
|
244 |
|
249 |
|
|
250 |
|
|
245 |
|
251 |
|
246 |
|
252 |
|
247 |
|
253 |
|
|
|
||
253 |
|
259 |
|
254 |
|
260 |
|
255 |
|
261 |
|
256 |
|
|
|
257 |
|
|
|
258 |
|
|
|
259 |
|
|
|
260 |
|
|
|
261 |
|
|
|
262 |
|
|
|
263 |
|
|
|
264 |
|
|
|
265 |
|
|
|
266 |
|
|
|
267 |
|
262 |
|
268 |
|
263 |
|
269 |
|
264 |
|
|
|
||
312 |
|
307 |
|
313 |
|
308 |
|
314 |
|
309 |
|
315 |
|
|
|
|
310 |
|
|
|
311 |
|
|
|
312 |
|
|
316 |
|
313 |
|
317 |
|
314 |
|
318 |
|
315 |
|
|
|
||
418 |
|
415 |
|
419 |
|
416 |
|
420 |
|
417 |
|
421 |
|
|
|
|
418 |
|
|
|
419 |
|
|
|
420 |
|
|
422 |
|
421 |
|
423 |
|
422 |
|
424 |
|
423 |
|
|
|
||
473 |
|
472 |
|
474 |
|
473 |
|
475 |
|
474 |
|
476 |
|
|
|
477 |
|
|
|
|
475 |
|
|
478 |
|
476 |
|
479 |
|
477 |
|
480 |
|
|
|
481 |
|
|
|
482 |
|
478 |
|
483 |
|
479 |
|
484 |
|
480 |
|
|
|
||
488 |
|
484 |
|
489 |
|
485 |
|
490 |
|
486 |
|
491 |
|
|
|
|
487 |
|
|
492 |
|
488 |
|
493 |
|
489 |
|
494 |
|
490 |
|
|
|
||
1036 |
|
1032 |
|
1037 |
|
1033 |
|
1038 |
|
1034 |
|
1039 |
|
|
|
|
1035 |
|
|
1040 |
|
1036 |
|
1041 |
|
1037 |
|
1042 |
|
1038 |
|
|
|
||
1201 |
|
1197 |
|
1202 |
|
1198 |
|
1203 |
|
1199 |
|
1204 |
|
|
|
1205 |
|
|
|
|
1200 |
|
|
1206 |
|
1201 |
|
1207 |
|
1202 |
|
1208 |
|
1203 |
|
|
|
||
1213 |
|
1208 |
|
1214 |
|
1209 |
|
1215 |
|
1210 |
|
|
1211 |
|
|
|
1212 |
|
|
|
1213 |
|
|
|
1214 |
|
|
1216 |
|
1215 |
|
1217 |
|
1216 |
|
1218 |
|
1217 |
|
1219 |
|
|
|
1220 |
|
|
|
|
1218 |
|
|
1221 |
|
1219 |
|
1222 |
|
1220 |
|
1223 |
|
1221 |
|
1224 |
|
1222 |
|
1225 |
|
|
|
|
1223 |
|
|
1226 |
|
1224 |
|
1227 |
|
1225 |
|
1228 |
|
1226 |
|
|
|
||
1360 |
|
1358 |
|
1361 |
|
1359 |
|
1362 |
|
1360 |
|
1363 |
|
|
|
|
1361 |
|
|
1364 |
|
1362 |
|
1365 |
|
1363 |
|
1366 |
|
1364 |
|
|
|
||
1407 |
|
1405 |
|
1408 |
|
1406 |
|
1409 |
|
1407 |
|
|
1408 |
|
|
|
1409 |
|
|
|
1410 |
|
|
|
1411 |
|
|
|
1412 |
|
|
|
1413 |
|
|
|
1414 |
|
|
|
1415 |
|
|
|
1416 |
|
|
|
1417 |
|
|
1410 |
|
1418 |
|
1411 |
|
1419 |
|
1412 |
|
1420 |
|
|
|
||
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
|
37 |
|
|
|
38 |
|
|
37 |
|
39 |
|
38 |
|
40 |
|
39 |
|
41 |
|
40 |
|
42 |
|
41 |
|
43 |
|
42 |
|
44 |
|
|
45 |
|
|
43 |
|
46 |
|
44 |
|
47 |
|
45 |
|
48 |
|
|
|
||
98 |
|
101 |
|
99 |
|
102 |
|
100 |
|
103 |
|
|
104 |
|
|
|
105 |
|
|
101 |
|
106 |
|
102 |
|
107 |
|
103 |
|
108 |
|
|
|
||
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
|
37 |
|
|
37 |
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
|
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
43 |
|
|
|
||
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
|
|
50 |
|
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
|
56 |
|
|
51 |
|
57 |
|
52 |
|
58 |
|
53 |
|
59 |
|
|
|
||
81 |
|
87 |
|
82 |
|
88 |
|
83 |
|
89 |
|
84 |
|
|
|
|
90 |
|
|
|
91 |
|
|
85 |
|
92 |
|
86 |
|
93 |
|
87 |
|
94 |
|
|
|
||
216 |
|
223 |
|
217 |
|
224 |
|
218 |
|
225 |
|
219 |
|
|
|
|
226 |
|
|
|
||
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
|
39 |
|
|
39 |
|
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
|
|
||
65 |
|
66 |
|
66 |
|
67 |
|
67 |
|
68 |
|
|
69 |
|
|
68 |
|
70 |
|
69 |
|
71 |
|
70 |
|
72 |
|
|
|
||
90 |
|
92 |
|
91 |
|
93 |
|
92 |
|
94 |
|
|
95 |
|
|
93 |
|
96 |
|
94 |
|
97 |
|
95 |
|
98 |
|