Modify

Opened 7 months ago

Closed 7 months ago

Last modified 7 months ago

#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 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 (11)

comment:1 Changed 7 months ago by Don-vip

Description: modified (diff)
Milestone: 18.09

comment:2 Changed 7 months ago by ris

Description: modified (diff)
Milestone: 18.09

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

comment:3 Changed 7 months ago by Don-vip

Resolution: fixed
Status: newclosed

In 14217/josm:

fix #16705 - RemoteControlHttpsServer: end mainloop if server.isClosed() (patch by ris)

comment:4 Changed 7 months ago by Don-vip

Thanks! :)

comment:5 Changed 7 months ago by Don-vip

Milestone: 18.09

I removed the import, it's ok :)

comment:6 Changed 7 months ago by ris

Ah well, also I somehow managed to remove the milestone flag from this ticket *shrug*

comment:7 Changed 7 months ago by ris

Well done.

comment:8 Changed 7 months ago by Don-vip

Description: modified (diff)

classic (and stupid) bug of Trac when conflicts arise. It's smart enough to detect conflicts but not to fix them!

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set.
The resolution will be deleted.

Add Comment


E-mail address and name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.