Add missing test on measure filters

2 files changed, 4 insertions, 1 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterEngine.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterEngine.java
index 97146643ce9..3bbe8973202 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterEngine.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterEngine.java
@@ -57,12 +57,13 @@ public class MeasureFilterEngine implements ServerComponent {
       MeasureFilter filter = factory.create(filterMap);
       List<MeasureFilterRow> rows = executor.execute(filter, context);
       result.setRows(rows);
-      result.setDurationInMs(System.currentTimeMillis() - start);
       log(context, result, logger);
 
     } catch (Exception e) {
       result.setError(MeasureFilterResult.Error.UNKNOWN);
       logger.error("Fail to execute measure filter: " + context, e);
+    } finally {
+      result.setDurationInMs(System.currentTimeMillis() - start);
     }
     return result;
   }
diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterEngineTest.java b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterEngineTest.java
index 95a4e8fc992..dc58aeb5364 100644
--- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterEngineTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterEngineTest.java
@@ -75,5 +75,7 @@ public class MeasureFilterEngineTest {
 
     assertThat(result.isSuccess()).isFalse();
     assertThat(result.getError()).isEqualTo(MeasureFilterResult.Error.UNKNOWN);
+    assertThat(result.getDurationInMs()).isGreaterThan(0L);
+    assertThat(result.getRows()).isNull();
   }
 }