Skip to content

Commit 11acb48

Browse files
shbhmexeMarkEWaite
andauthored
Fix PluginWrapper bug and cleanup Javadoc placeholders (#25984)
* Fix synchronization, PluginWrapper bug, and cleanup Javadoc - Fix inconsistent synchronization in Fingerprint.java on 'usages' field by synchronizing on 'this'. - Fix logic bug in PluginWrapper.java where setOptionalDependants passed incorrect field instead of parameter. - Replace Boolean.getBoolean with SystemProperties.getBoolean in Jenkins.java and JnlpSlaveRestarterInstaller.java for best practices. - Update placeholder version numbers (@deprecated and @SInCE) in StreamTaskListener, StreamBuildListener, and JNLPLauncher. Signed-off-by: shbhmexe <shubhushukla586@gmail.com> * Update core/src/main/java/hudson/model/StreamBuildListener.java Co-authored-by: Mark Waite <mark.earl.waite@gmail.com> * Update core/src/main/java/hudson/slaves/JNLPLauncher.java Co-authored-by: Mark Waite <mark.earl.waite@gmail.com> * Update core/src/main/java/hudson/util/StreamTaskListener.java Co-authored-by: Mark Waite <mark.earl.waite@gmail.com> * Update core/src/main/java/jenkins/model/Jenkins.java Co-authored-by: Mark Waite <mark.earl.waite@gmail.com> * Update core/src/main/java/jenkins/slaves/restarter/JnlpSlaveRestarterInstaller.java Co-authored-by: Mark Waite <mark.earl.waite@gmail.com> * Update Fingerprint.java * Revert JnlpSlaveRestarterInstaller SystemProperties change per reviewer feedback --------- Signed-off-by: shbhmexe <shubhushukla586@gmail.com> Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
1 parent 84498e2 commit 11acb48

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

core/src/main/java/hudson/PluginWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public void setOptionalDependents(@NonNull Set<String> optionalDependents) {
253253
*/
254254
@Deprecated
255255
public void setOptionalDependants(@NonNull Set<String> optionalDependents) {
256-
setOptionalDependents(dependents);
256+
setOptionalDependents(optionalDependents);
257257
}
258258

259259
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public StreamBuildListener(File out, Charset charset) throws IOException {
4848
}
4949

5050
/**
51-
* @deprecated as of TODO
51+
* @deprecated as of 2.329
5252
* The caller should use {@link #StreamBuildListener(OutputStream, Charset)} to pass in
5353
* the charset and output stream separately, so that this class can handle encoding correctly.
5454
*/

core/src/main/java/hudson/slaves/JNLPLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void launch(SlaveComputer computer, TaskListener listener) {
185185
}
186186

187187
/**
188-
* @deprecated as of 1.XXX
188+
* @deprecated as of 2.2
189189
* Use {@link Jenkins#getDescriptor(Class)}
190190
*/
191191
@Deprecated

core/src/main/java/hudson/util/StreamTaskListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public StreamTaskListener(@NonNull PrintStream out) {
7474
}
7575

7676
/**
77-
* @deprecated as of TODO
77+
* @deprecated as of 2.328
7878
* The caller should use {@link #StreamTaskListener(OutputStream, Charset)} to pass in
7979
* the charset and output stream separately, so that this class can handle encoding correctly,
8080
* or use {@link #fromStdout()} or {@link #fromStderr()}.
@@ -94,7 +94,7 @@ public StreamTaskListener(@NonNull OutputStream out, @CheckForNull Charset chars
9494
}
9595

9696
/**
97-
* @deprecated as of TODO
97+
* @deprecated as of 2.329
9898
* The caller should use {@link #StreamTaskListener(File, Charset)} to pass in
9999
* the charset and file separately, so that this class can handle encoding correctly.
100100
*/

0 commit comments

Comments
 (0)