Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup #91

Merged
merged 3 commits into from
Feb 1, 2019
Merged

Cleanup #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27293a2
Cleanup - Use ClassLoaderSanityThreadFactory from core instead of own…
darxriggs Jan 31, 2019
9230f85
Cleanup - Use Functions.printStackTrace instread of Functions.printTh…
darxriggs Jan 31, 2019
3b1f6c9
Cleanup - Remove obsolete @SuppressFBWarnings annotation
darxriggs Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/main/java/org/jenkinsci/plugins/workflow/support/actions/WorkspaceActionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

package org.jenkinsci.plugins.workflow.support.actions;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.FilePath;
import hudson.model.DirectoryBrowserSupport;
import hudson.model.Item;
Expand All @@ -51,7 +50,6 @@ public final class WorkspaceActionImpl extends WorkspaceAction implements FlowNo
private final Set<LabelAtom> labels;
private transient FlowNode parent;

@SuppressFBWarnings(value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification="TODO 1.653+ switch to Jenkins.getInstanceOrNull")
public WorkspaceActionImpl(FilePath workspace, FlowNode parent) {
node = FilePathUtils.getNodeName(workspace);
Jenkins j = Jenkins.getInstanceOrNull();
Expand Down
13 changes: 2 additions & 11 deletions src/main/java/org/jenkinsci/plugins/workflow/support/concurrent/Timeout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import hudson.FilePath;
import hudson.Util;
import hudson.remoting.VirtualChannel;
import hudson.util.ClassLoaderSanityThreadFactory;
import hudson.util.DaemonThreadFactory;
import hudson.util.NamingThreadFactory;
import java.util.concurrent.Executors;
Expand All @@ -44,17 +45,7 @@ public class Timeout implements AutoCloseable {

private static final Logger LOGGER = Logger.getLogger(Timeout.class.getName());

// TODO 2.105+ use ClassLoaderSanityThreadFactory from core
static class ClassloaderSanityDaemonThreadFactory extends DaemonThreadFactory {
public Thread newThread(Runnable r) {
Thread t = super.newThread(r);
t.setContextClassLoader(Timeout.class.getClassLoader());
return t;
}
}


private static final ScheduledExecutorService interruptions = Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory(new ClassloaderSanityDaemonThreadFactory(), "Timeout.interruptions"));
private static final ScheduledExecutorService interruptions = Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory(new ClassLoaderSanityThreadFactory(new DaemonThreadFactory()), "Timeout.interruptions"));

private final Thread thread;
private volatile boolean completed;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/workflow/support/pickles/TryRepeatedly.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void run() {
try {
printWaitingMessage(listener);
} catch (Exception x) {
listener.getLogger().println(Functions.printThrowable(x).trim()); // TODO 2.43+ use Functions.printStackTrace
Functions.printStackTrace(x, listener.getLogger());
}
} catch (IOException x) {
LOGGER.log(Level.WARNING, null, x);
Expand Down