You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2020/04/17 12:32:06 UTC
[sling-org-apache-sling-commons-metrics-rrd4j] branch master
updated (03a5bd6 -> a3c6864)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics-rrd4j.git.
from 03a5bd6 Updating badges for org-apache-sling-commons-metrics-rrd4j
new 7ba7016 SLING-9382 Shutdown executor before closing db connection
new a3c6864 SLING-9381 Upgrade RRD4J to version 3.6 (Java 11 compatible)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[sling-org-apache-sling-commons-metrics-rrd4j] 02/02: SLING-9381
Upgrade RRD4J to version 3.6 (Java 11 compatible)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics-rrd4j.git
commit a3c6864a1dadeec94bea558ce70635c093e96aea
Author: Harsh Mehta <hm...@adobe.com>
AuthorDate: Fri Apr 17 17:03:57 2020 +0530
SLING-9381 Upgrade RRD4J to version 3.6 (Java 11 compatible)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c4645b5..72dd211 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.rrd4j</groupId>
<artifactId>rrd4j</artifactId>
- <version>3.1</version>
+ <version>3.6</version>
<scope>provided</scope>
</dependency>
<dependency>
[sling-org-apache-sling-commons-metrics-rrd4j] 01/02: SLING-9382
Shutdown executor before closing db connection
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics-rrd4j.git
commit 7ba701633001dade0f541370341d8a93c6ac4f65
Author: Harsh Mehta <hm...@adobe.com>
AuthorDate: Fri Apr 17 17:00:43 2020 +0530
SLING-9382 Shutdown executor before closing db connection
---
.../java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java b/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java
index 5cb9418..e9c1063 100644
--- a/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java
+++ b/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java
@@ -210,6 +210,7 @@ class RRD4JReporter extends ScheduledReporter {
@Override
public void close() {
+ super.close();
try {
// write an unknown sample before closing the DB
if (!rrdDB.isClosed()) {
@@ -219,7 +220,6 @@ class RRD4JReporter extends ScheduledReporter {
} catch (IOException e) {
LOGGER.warn("Closing RRD failed", e);
}
- super.close();
}
@Override