Skip to content
Permalink
Browse files
[JENKINS-26719] Enable the delay for dynamic views as well.
  • Loading branch information
Vlatombe committed Apr 2, 2015
1 parent 322ca3b commit 07259dba2c6e269b0f007cfafe195b46df1410f0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
@@ -948,10 +948,11 @@ protected abstract CheckoutAction createCheckOutAction(VariableResolver<String>
throws IOException, InterruptedException;

protected ClearTool createClearTool(VariableResolver<String> variableResolver, ClearToolLauncher launcher) {
int endViewDelay = PluginImpl.BASE_DESCRIPTOR.getEndViewDelay();
if (isUseDynamicView()) {
return new ClearToolDynamic(variableResolver, launcher, getViewDrive(), getMkviewOptionalParam());
return new ClearToolDynamic(variableResolver, launcher, getViewDrive(), getMkviewOptionalParam(), endViewDelay);
}
return new ClearToolSnapshot(variableResolver, launcher, mkviewOptionalParam, PluginImpl.BASE_DESCRIPTOR.getEndViewDelay());
return new ClearToolSnapshot(variableResolver, launcher, mkviewOptionalParam, endViewDelay);
}

/**
@@ -35,7 +35,11 @@ public class ClearToolDynamic extends ClearToolExec {
private transient String viewDrive;

public ClearToolDynamic(VariableResolver<String> variableResolver, ClearToolLauncher launcher, String viewDrive, String optionalMkviewParameters) {
super(variableResolver, launcher, optionalMkviewParameters);
this(variableResolver, launcher, viewDrive, optionalMkviewParameters, 0);
}

public ClearToolDynamic(VariableResolver<String> variableResolver, ClearToolLauncher launcher, String viewDrive, String optionalMkviewParameters, int endViewDelay) {
super(variableResolver, launcher, optionalMkviewParameters, endViewDelay);
this.viewDrive = viewDrive;
}

@@ -84,6 +84,7 @@ public abstract class ClearToolExec implements ClearTool {
private transient CleartoolVersion version;
private transient Pattern viewListPattern;

@Deprecated
public ClearToolExec(VariableResolver<String> variableResolver, ClearToolLauncher launcher, String optionalMkviewParameters) {
this(variableResolver, launcher, optionalMkviewParameters, 0);
}
@@ -69,7 +69,7 @@ public class ClearToolExecTest extends AbstractWorkspaceTest {
private static class ClearToolImpl extends ClearToolExec {

public ClearToolImpl(ClearToolLauncher launcher) {
super(null, launcher, null);
super(null, launcher, null, 0);
}

@Override

0 comments on commit 07259db

Please sign in to comment.