instable state
authorpenk
Wed, 09 Jul 2003 19:06:03 +0200
changeset 5040 1500f0fdf4dd
parent 5039 caae5e9009c8
child 5041 c72e35116b13
instable state
AbstractSettingsApplication.st
--- a/AbstractSettingsApplication.st	Wed Jul 09 18:51:10 2003 +0200
+++ b/AbstractSettingsApplication.st	Wed Jul 09 19:06:03 2003 +0200
@@ -3257,12 +3257,14 @@
 
 setPortOnFreePort
 
-    | highestUsedPortNr portToUse |
+    | highestUsedPortNr portToUse instances|
 
     HTTPServer isLoaded ifFalse:[
         portToUse := 8080
     ] ifTrue:[
-        highestUsedPortNr := HTTPServer allInstances 
+        instances := HTTPServer runningServers asSet.
+        instances addAll:((self settingsDialog getAllChildrenAppsForApplication:self) collect:[:aApp| aApp httpServerInstance]).
+        highestUsedPortNr := instances 
                                 inject:(HTTPServer port - 1) 
                                 into:[:maxSoFar :thisServer | thisServer port max:maxSoFar].
 
@@ -3294,15 +3296,10 @@
     ^ resources 
         string:'HTTPSTARTINFO'
         default:
-'These dialogs provides two things 
-1. Setup the default server settings 
-2. control individual running servers (if you want to handle 
-   multiple servers on multiple ports).
-The default servers'' settings are specified in the 
-"HTTPServer Default Settings" entry.
-The settings for a new server are taken from
-the default server settings or from the http server instance 
-settings file'
+'This dialog allows to control individual running servers 
+(if you want to handle multiple servers on multiple ports)
+Every new created server startup with the settings provided
+by the Default Item.'
 !
 
 portNumberChannel
@@ -10816,5 +10813,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.82 2003-07-09 13:45:32 penk Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.83 2003-07-09 17:06:03 penk Exp $'
+! !