Skip to content

Commit ab5d148

Browse files
author
stephenconnolly
committed
this needs to get called for each computer in order to allow slave launchers to release claimed resources
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@10137 71c3de6d-444a-0410-be80-ed276b4c234a
1 parent c3c02dc commit ab5d148

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

core/src/main/java/hudson/model/Hudson.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ public String getDescription() {
413413
public PluginManager getPluginManager() {
414414
return pluginManager;
415415
}
416-
416+
417417
public UpdateCenter getUpdateCenter() {
418418
return updateCenter;
419419
}
@@ -1379,6 +1379,7 @@ public void cleanUp() {
13791379
for( Computer c : computers.values() ) {
13801380
c.interrupt();
13811381
c.kill();
1382+
c.disconnect();
13821383
}
13831384
ExternalJob.reloadThread.interrupt();
13841385
Trigger.timer.cancel();
@@ -2164,7 +2165,7 @@ protected void check() throws IOException, ServletException {
21642165
* If the parameter "value" is not set then the parameter "errorText" is displayed
21652166
* as an error text. If the parameter "errorText" is not set, then the parameter "warningText" is
21662167
* displayed as a warning text.
2167-
* <p/>
2168+
* <p/>
21682169
* If the text is set and the parameter "type" is set, it will validate that the value is of the
21692170
* correct type. Supported types are "number, "number-positive" and "number-negative".
21702171
* @param req containing the parameter value and the errorText to display if the value isnt set
@@ -2174,7 +2175,7 @@ protected void check() throws IOException, ServletException {
21742175
*/
21752176
public void doFieldCheck(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
21762177
new FormFieldValidator(req, rsp, false) {
2177-
2178+
21782179
/**
21792180
* Display the error text or warning text.
21802181
*/
@@ -2190,9 +2191,9 @@ private void fieldCheckFailed() throws IOException, ServletException {
21902191
return;
21912192
}
21922193
error("No error or warning text was set for fieldCheck().");
2193-
return;
2194+
return;
21942195
}
2195-
2196+
21962197
/**
21972198
* Checks if the value is of the correct type.
21982199
* @param type the type of string
@@ -2202,7 +2203,7 @@ private void fieldCheckFailed() throws IOException, ServletException {
22022203
private boolean checkType(String type, String value) throws IOException, ServletException {
22032204
try {
22042205
if (type.equalsIgnoreCase("number")) {
2205-
NumberFormat.getInstance().parse(value);
2206+
NumberFormat.getInstance().parse(value);
22062207
} else if (type.equalsIgnoreCase("number-positive")) {
22072208
if (NumberFormat.getInstance().parse(value).floatValue() <= 0) {
22082209
error(Messages.Hudson_NotAPositiveNumber());
@@ -2220,7 +2221,7 @@ private boolean checkType(String type, String value) throws IOException, Servlet
22202221
}
22212222
return true;
22222223
}
2223-
2224+
22242225
@Override
22252226
protected void check() throws IOException, ServletException {
22262227
String value = fixEmpty(request.getParameter("value"));

0 commit comments

Comments
 (0)