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 78180abc5050bd397be7854e8467b94c88267bce..2654583fa0d4779dfe16c1ed271305112fa5a192 100644 (file)
--- 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 0f9240c93f07602039ef86741ca00f9b00d376c2..95fd965688664c82f91798148fe1348d39865244 100644 (file)
--- 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