Opened 7 years ago

Last modified 7 years ago

#16705 closed defect

[PATCH] RemoteControlHttpsServer: end mainloop if server.isClosed() — at Version 1

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 Don-vip)

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.

Change History (4)

comment:1 by Don-vip, 7 years ago

Description: modified (diff)
Milestone: 18.09
Note: See TracTickets for help on using tickets.