summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2018-09-04 11:05:25 +0200
committerGitHub <noreply@github.com>2018-09-04 11:05:25 +0200
commitf0405491348b35153b6bc3137ae8af6df7255c05 (patch)
tree143333cd92b0a7c18dc802589bf523048f9327bd
parentfb7770220e568a4cdf3f904a6905132c6e90d892 (diff)
parentfec6971f3e36797bf19a06c8de6318b3e60a7d22 (diff)
Merge pull request #6779 from vespa-engine/gjoranv/use-new-setScale
Gjoranv/use new set scale
-rw-r--r--container-accesslogging/pom.xml11
-rw-r--r--container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java2
2 files changed, 1 insertions, 12 deletions
diff --git a/container-accesslogging/pom.xml b/container-accesslogging/pom.xml
index 0d7b134c58c..b2c9bd7db8b 100644
--- a/container-accesslogging/pom.xml
+++ b/container-accesslogging/pom.xml
@@ -87,17 +87,6 @@
<artifactId>bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgs>
- <arg>-Xlint:all</arg>
- <arg>-Xlint:-serial</arg>
- <arg>-Werror</arg>
- </compilerArgs>
- </configuration>
- </plugin>
</plugins>
<outputDirectory>${buildOutputDirectory}</outputDirectory>
</build>
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java
index adadd0b1414..595bd99a759 100644
--- a/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java
+++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java
@@ -175,7 +175,7 @@ public class JSONFormatter {
duration = new BigDecimal(0xffffffff);
}
- return duration.setScale(3, BigDecimal.ROUND_HALF_UP);
+ return duration.setScale(3, RoundingMode.HALF_UP);
}
private static String getNormalizedURI(String rawPath, String rawQuery) {