[FIXED JENKINS-12023] Quality Center plugin fails when timeout is not…

… set
jenkinsci · Dec 7, 2011 · f8a0435 · f8a0435
1 parent cc69102
commit f8a0435
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/main/java/com/michelin/cio/hudson/plugins/qc/QualityCenter.java b/src/main/java/com/michelin/cio/hudson/plugins/qc/QualityCenter.java
@@ -73,6 +73,8 @@ public class QualityCenter extends Builder {
   public final static String RUN_MODE_PLANNED_HOST = "RUN_PLANNED_HOST";
   public final static String RUN_MODE_REMOTE = "RUN_REMOTE";
   public final static String[] RUN_MODES = { RUN_MODE_PLANNED_HOST, RUN_MODE_REMOTE, RUN_MODE_LOCAL };
+
+  public final static int DEFAULT_TIMEOUT = 600;
 
   /** Quality Center installation name. */
   private final String qcClientInstallationName;
@@ -95,7 +97,7 @@ public class QualityCenter extends Builder {
   /** The name of the report file. */
   private final String qcTSLogFile;
   /** Timeout */
-  private final String qcTimeOut;
+  private final int qcTimeOut;
   /** The parsed name (env vars) of the report file. */
   private String parsedQcTSLogFile;
   private String runMode;
@@ -113,7 +115,7 @@ public QualityCenter(
             String qcTSFolder,
             String qcTSName,
             String qcTSLogFile,
-            String qcTimeOut,
+            int qcTimeOut,
             String runMode,
             String runHost) {
     this.qcClientInstallationName = qcClientInstallationName;
@@ -126,7 +128,12 @@ public QualityCenter(
     this.qcTSFolder = qcTSFolder;
     this.qcTSName = qcTSName;
     this.qcTSLogFile = qcTSLogFile;
-    this.qcTimeOut = qcTimeOut;
+    if(qcTimeOut <= 0) {
+      this.qcTimeOut = DEFAULT_TIMEOUT;
+    }
+    else {
+      this.qcTimeOut = qcTimeOut;
+    }
     if(Arrays.asList(RUN_MODES).contains(runMode)) {
       this.runMode = runMode;
     }
@@ -185,7 +192,7 @@ public String getQcTSName() {
     return qcTSName;
   }
 
-  public String getQcTimeOut() {
+  public int getQcTimeOut() {
     return qcTimeOut;
   }
 
@@ -346,7 +353,7 @@ private String runVBScript(String testSetName, AbstractBuild<?, ?> build, Launch
     args.add(Util.replaceMacro(env.expand(this.qcLogin), varResolver));
 
     // If no password, then replace by ""
-    if(!StringUtils.isBlank(this.qcPass)) {
+    if(StringUtils.isNotBlank(this.qcPass)) {
       args.addMasked(Util.replaceMacro(env.expand(this.qcPass), varResolver));
     }
     else {