Commit b7e434a2 authored by Kishen Maloor's avatar Kishen Maloor

Merge branch 'origin/fargo' into gaborone

Signed-off-by: Kishen Maloor's avatarKishen Maloor <kishen.maloor@intel.com>
parents 5399f3be 1c8f5e54
Pipeline #1019 passed with stage
in 14 minutes and 15 seconds
......@@ -74,7 +74,7 @@ void
oc_send_response(oc_request_t *request, oc_status_t response_code)
{
#ifdef OC_SPEC_VER_OIC
if (request->origin->version == OIC_VER_1_1_0) {
if (request->origin && request->origin->version == OIC_VER_1_1_0) {
request->response->content_format = APPLICATION_CBOR;
} else
#endif /* OC_SPEC_VER_OIC */
......
......@@ -11,7 +11,7 @@ extern "C" {
typedef uint64_t oc_clock_time_t;
#define OC_CLOCK_CONF_TICKS_PER_SECOND CLOCKS_PER_SEC
#define OC_SPEC_VER_OIC
//#define OC_SPEC_VER_OIC
/* Security Layer */
/* Max inactivity timeout before tearing down DTLS connection */
#define OC_DTLS_INACTIVITY_TIMEOUT (600)
......
......@@ -116,7 +116,7 @@ void jni_oc_core_add_device_callback(void *user_data)
jni_callback_data *user_data = (jni_callback_data *)malloc(sizeof *user_data);
user_data->jenv = jenv;
user_data->jcb_obj = JCALL1(NewGlobalRef, jenv, $input);
user_data->cb_valid = OC_CALLBACK_VALID_FOR_A_SINGLE_CALL;
user_data->cb_valid = OC_CALLBACK_VALID_TILL_SHUTDOWN;
jni_list_add(user_data);
$1 = jni_oc_core_add_device_callback;
$2 = user_data;
......@@ -160,4 +160,4 @@ oc_device_info_t * jni_oc_core_add_new_device1(const char *uri, const char *rt,
%rename (filterResourceByRt) oc_filter_resource_by_rt;
%rename (isDCR) oc_core_is_DCR;
%include "oc_core_res.h"
\ No newline at end of file
%include "oc_core_res.h"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment