Merge branch 'origin/master' into fargo

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>

api/oc_server_api.c

@@ -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 */

port/android/oc_config.h

@@ -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)

swig/swig_interfaces/oc_core_res.i

@@ -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"