src/plugin.c: Introduce the `DS_TYPE_TO_STRING' macro.

[collectd.git] / src / java.c

diff --git a/src/java.c b/src/java.c
index 903b4a5..64e51d3 100644 (file)
--- a/src/java.c
+++ b/src/java.c
@@ -284,6 +284,10 @@ static jobject ctoj_value_to_number (JNIEnv *jvm_env, /* {{{ */
     return (ctoj_jlong_to_number (jvm_env, (jlong) value.counter));
   else if (ds_type == DS_TYPE_GAUGE)
     return (ctoj_jdouble_to_number (jvm_env, (jdouble) value.gauge));
+  if (ds_type == DS_TYPE_DERIVE)
+    return (ctoj_jlong_to_number (jvm_env, (jlong) value.derive));
+  if (ds_type == DS_TYPE_ABSOLUTE)
+    return (ctoj_jlong_to_number (jvm_env, (jlong) value.absolute));
   else
     return (NULL);
 } /* }}} jobject ctoj_value_to_number */
@@ -1970,7 +1974,7 @@ static int cjni_create_jvm (void) /* {{{ */
     vm_args.options[i].optionString = jvm_argv[i];
   }
 
-  status = JNI_CreateJavaVM (&jvm, (void **) &jvm_env, (void **) &vm_args);
+  status = JNI_CreateJavaVM (&jvm, (void *) &jvm_env, (void *) &vm_args);
   if (status != 0)
   {
     ERROR ("java plugin: cjni_create_jvm: "
@@ -2926,7 +2930,7 @@ static int cjni_shutdown (void) /* {{{ */
   memset (&args, 0, sizeof (args));
   args.version = JNI_VERSION_1_2;
 
-  status = (*jvm)->AttachCurrentThread (jvm, (void **) &jvm_env, &args);
+  status = (*jvm)->AttachCurrentThread (jvm, (void *) &jvm_env, &args);
   if (status != 0)
   {
     ERROR ("java plugin: cjni_shutdown: AttachCurrentThread failed with status %i.",