From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 4 Mar 2014 10:14:49 +0000 (+0100)
Subject: SONAR-4366 Fix validation issue on operators for working duration
X-Git-Tag: 4.3~570
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f69cb0b210aafe5bb9a5738920774261b5c0e000;p=sonarqube.git

SONAR-4366 Fix validation issue on operators for working duration
---

diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionDto.java b/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionDto.java
index 78180abc505..2654583fa0d 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionDto.java
@@ -197,6 +197,7 @@ public class QualityGateConditionDto {
         case PERCENT:
         case MILLISEC:
         case RATING:
+        case WORK_DUR:
           operators = NUMERIC_OPERATORS;
           break;
         default:
diff --git a/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java b/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java
index 0f9240c93f0..95fd9656886 100644
--- a/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java
+++ b/sonar-server/src/main/java/org/sonar/server/exceptions/BadRequestException.java
@@ -116,7 +116,11 @@ public class BadRequestException extends ServerException {
 
     @CheckForNull
     public Object[] l10nParams() {
-      return Arrays.copyOf(l10nParams, l10nParams.length);
+      if (l10nParams == null) {
+        return null;
+      } else {
+        return Arrays.copyOf(l10nParams, l10nParams.length);
+      }
     }
 
     @Override