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

[GH-12] Fix exception caused by offline cause localization #13

Merged
merged 1 commit into from
Oct 16, 2020
Merged

[GH-12] Fix exception caused by offline cause localization #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 3 additions & 12 deletions src/main/java/org/jenkinsci/plugins/proxmox/VirtualMachineSlaveComputer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicBoolean;

import org.jvnet.localizer.Localizable;
import org.jvnet.localizer.ResourceBundleHolder;

import hudson.Messages;
import hudson.model.Executor;
import hudson.model.Node;
import hudson.model.Queue;
Expand All @@ -18,11 +14,6 @@

public class VirtualMachineSlaveComputer extends SlaveComputer {

/**
* The resource bundle reference
*
*/
private final static ResourceBundleHolder holder = ResourceBundleHolder.get(Messages.class);
private AtomicBoolean isRevertingSnapshot = new AtomicBoolean(false);

public VirtualMachineSlaveComputer(Slave slave) {
Expand All @@ -34,8 +25,8 @@ public void tryReconnect() {
if(isRevertingSnapshot.get()) {
getListener().getLogger().println("INFO: trying to reconnect while snapshot revert - ignoring");
return;
}
}

super.tryReconnect();
}

Expand All @@ -53,7 +44,7 @@ public void taskAccepted(Executor executor, Queue.Task task) {
try {
isRevertingSnapshot.set(true);

final Future<?> disconnectFuture = disconnect(OfflineCause.create(new Localizable(holder, "Disconnect before snapshot revert")));
final Future<?> disconnectFuture = disconnect(OfflineCause.create(Messages._VirtualMachineSlaveComputer_disconnectBeforeSnapshotRevert()));
disconnectFuture.get();
getListener().getLogger().println("INFO: slave disconnected");

Expand Down
1 change: 1 addition & 0 deletions src/main/resources/org/jenkinsci/plugins/proxmox/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VirtualMachineSlaveComputer.disconnectBeforeSnapshotRevert=Disconnect before snapshot revert