#16705 closed defect (fixed)
[PATCH] RemoteControlHttpsServer: end mainloop if server.isClosed()
| Reported by: | ris | Owned by: | team |
|---|---|---|---|
| Priority: | normal | Milestone: | 18.09 |
| Component: | Core remotecontrol | Version: | |
| Keywords: | https stop remotecontrol tests | Cc: |
Description (last modified by )
https://github.com/openstreetmap/josm/pull/35
This importantly adds a line
if (!server.isClosed()) { Logging.error(e); + } else { + // stop the thread automatically if server is stopped + return; }
corresponding to a similar line in RemoteControlHttpServer which appears to be missing in RemoteControlHttpsServer, meaning that a RemoteControlHttpsServer thread that's been "stopped" would actually just spin forever, erroring on the closed ServerSocket.
Also in these patches I've ported the RemoteControlTest from JOSMFixture to JOSMTestRules and improved AddNodeHandlerTest's robustness by giving it the options it needs to be able to properly create a data layer.
And I really do think this has made appveyor's builds properly reliable now.
Attachments (3)
Change History (11)
by , 7 years ago
| Attachment: | v1-0001-tests-RemoteControlTest-convert-from-JOSMFixture-.patch added |
|---|
by , 7 years ago
| Attachment: | v1-0002-tests-AddNodeHandlerTest-add-main-assertionsInEDT.patch added |
|---|
by , 7 years ago
| Attachment: | v1-0003-RemoteControlHttpsServer-end-mainloop-if-server.i.patch added |
|---|
comment:1 by , 7 years ago
| Description: | modified (diff) |
|---|---|
| Milestone: | → 18.09 |
comment:2 by , 7 years ago
| Description: | modified (diff) |
|---|---|
| Milestone: | 18.09 |
comment:6 by , 7 years ago
Ah well, also I somehow managed to remove the milestone flag from this ticket *shrug*
comment:8 by , 7 years ago
| Description: | modified (diff) |
|---|
classic (and stupid) bug of Trac when conflicts arise. It's smart enough to detect conflicts but not to fix them!



(hold on, I've forgotten to remove the now-redundant
JOSMFixtureimport...)