Skip to content

Commit

Permalink
jvm options getter fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
mavlyutov committed Jan 29, 2014
1 parent b36573e commit be45e51
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public String getJenkinsUser() {
}

public String getJvmOptions() {
if (jvmOptions == null || jenkinsUser.equals("")) {
if (jvmOptions == null || jvmOptions.equals("")) {
return "";
} else {
return jvmOptions;
Expand Down Expand Up @@ -180,6 +180,7 @@ public JCloudsSlave provisionSlave(TaskListener listener) throws IOException {
}
}

@Override
public NodeMetadata get() {
LOGGER.info("Provisioning new jclouds node");
ImmutableMap<String, String> userMetadata = ImmutableMap.of("Name", name);
Expand Down Expand Up @@ -306,6 +307,7 @@ private RuntimeException destroyBadNodesAndPropagate(RunNodesException e) {
throw propagate(e);
}

@Override
@SuppressWarnings("unchecked")
public Descriptor<JCloudsSlaveTemplate> getDescriptor() {
return Jenkins.getInstance().getDescriptor(getClass());
Expand Down

0 comments on commit be45e51

Please sign in to comment.