From: Manuel Luis Sanmartín Rozada <manuel.luis@gmail.com>
Date: Thu, 19 Jun 2014 13:14:02 +0000 (+0200)
Subject: Plugin java: fix notification time conversion to cdtime_t.
X-Git-Tag: collectd-5.5.0~281^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=23880c7274a6fc021d4f7d20c524663aac87e88c

Plugin java: fix notification time conversion to cdtime_t.
---

diff --git a/src/java.c b/src/java.c
index b69ca946..ee503550 100644
--- a/src/java.c
+++ b/src/java.c
@@ -906,7 +906,7 @@ static jobject ctoj_notification (JNIEnv *jvm_env, /* {{{ */
 #undef SET_STRING
 
   /* Set the `time' member. Java stores time in milliseconds. */
-  status = ctoj_long (jvm_env, ((jlong) n->time) * ((jlong) 1000),
+  status = ctoj_long (jvm_env, (jlong) CDTIME_T_TO_MS (n->time),
       c_notification, o_notification, "setTime");
   if (status != 0)
   {
@@ -1306,7 +1306,7 @@ static int jtoc_notification (JNIEnv *jvm_env, notification_t *n, /* {{{ */
     return (-1);
   }
   /* Java measures time in milliseconds. */
-  n->time = (time_t) (tmp_long / ((jlong) 1000));
+  n->time = MS_TO_CDTIME_T(tmp_long);
 
   status = jtoc_int (jvm_env, &tmp_int,
       class_ptr, object_ptr, "getSeverity");