From 8273556539555078d53e634f1a7183c5159dfae4 Mon Sep 17 00:00:00 2001 From: Petre Eftime Date: Wed, 9 Dec 2015 14:34:19 +0200 Subject: [PATCH] java: fix Java IsrCallback crash The director now uses a GlobalRef instead of a WeakRef to the IsrCallback object Signed-off-by: Petre Eftime Signed-off-by: Mihai Tudor Panu --- src/a110x/javaupm_a110x.i | 2 +- src/bma220/javaupm_bma220.i | 2 +- src/grove/javaupm_grove.i | 2 +- src/lsm9ds0/javaupm_lsm9ds0.i | 2 +- src/mma7660/javaupm_mma7660.i | 2 +- src/mpu9150/javaupm_mpu9150.i | 2 +- src/nrf24l01/javaupm_nrf24l01.i | 1 + src/pulsensor/javaupm_pulsensor.i | 1 + src/rpr220/javaupm_rpr220.i | 2 +- src/ttp223/javaupm_ttp223.i | 2 +- 10 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/a110x/javaupm_a110x.i b/src/a110x/javaupm_a110x.i index 7db0fcbe..8f8d751d 100644 --- a/src/a110x/javaupm_a110x.i +++ b/src/a110x/javaupm_a110x.i @@ -4,7 +4,7 @@ %include "typemaps.i" %feature("director") IsrCallback; - +SWIG_DIRECTOR_OWNED(IsrCallback) %ignore generic_callback_isr; %include "../IsrCallback.h" diff --git a/src/bma220/javaupm_bma220.i b/src/bma220/javaupm_bma220.i index 72051780..f292013f 100644 --- a/src/bma220/javaupm_bma220.i +++ b/src/bma220/javaupm_bma220.i @@ -6,7 +6,7 @@ %include "../java_buffer.i" %feature("director") IsrCallback; - +SWIG_DIRECTOR_OWNED(IsrCallback) %ignore generic_callback_isr; %include "../IsrCallback.h" diff --git a/src/grove/javaupm_grove.i b/src/grove/javaupm_grove.i index 77634047..21967356 100644 --- a/src/grove/javaupm_grove.i +++ b/src/grove/javaupm_grove.i @@ -3,7 +3,7 @@ %include "../upm.i" %feature("director") IsrCallback; - +SWIG_DIRECTOR_OWNED(IsrCallback) %ignore generic_callback_isr; %include "../IsrCallback.h" diff --git a/src/lsm9ds0/javaupm_lsm9ds0.i b/src/lsm9ds0/javaupm_lsm9ds0.i index 7bfc7910..b54983e9 100644 --- a/src/lsm9ds0/javaupm_lsm9ds0.i +++ b/src/lsm9ds0/javaupm_lsm9ds0.i @@ -6,7 +6,7 @@ %include "../java_buffer.i" %feature("director") IsrCallback; - +SWIG_DIRECTOR_OWNED(IsrCallback) %ignore generic_callback_isr; %include "../IsrCallback.h" diff --git a/src/mma7660/javaupm_mma7660.i b/src/mma7660/javaupm_mma7660.i index e1f0b590..8ec07499 100644 --- a/src/mma7660/javaupm_mma7660.i +++ b/src/mma7660/javaupm_mma7660.i @@ -4,7 +4,7 @@ %include "typemaps.i" %feature("director") IsrCallback; - +SWIG_DIRECTOR_OWNED(IsrCallback) %ignore generic_callback_isr; %include "../IsrCallback.h" diff --git a/src/mpu9150/javaupm_mpu9150.i b/src/mpu9150/javaupm_mpu9150.i index 5e3d0b04..37d5eac0 100644 --- a/src/mpu9150/javaupm_mpu9150.i +++ b/src/mpu9150/javaupm_mpu9150.i @@ -5,7 +5,7 @@ %include "../java_buffer.i" %feature("director") IsrCallback; - +SWIG_DIRECTOR_OWNED(IsrCallback) %ignore generic_callback_isr; %include "../IsrCallback.h" diff --git a/src/nrf24l01/javaupm_nrf24l01.i b/src/nrf24l01/javaupm_nrf24l01.i index 924b8516..a78cbc30 100644 --- a/src/nrf24l01/javaupm_nrf24l01.i +++ b/src/nrf24l01/javaupm_nrf24l01.i @@ -2,6 +2,7 @@ %include "../upm.i" %feature("director") Callback; +SWIG_DIRECTOR_OWNED(Callback) %include "arrays_java.i"; %apply signed char[] {uint8_t *}; diff --git a/src/pulsensor/javaupm_pulsensor.i b/src/pulsensor/javaupm_pulsensor.i index 7dc3a261..91b34ccf 100644 --- a/src/pulsensor/javaupm_pulsensor.i +++ b/src/pulsensor/javaupm_pulsensor.i @@ -3,6 +3,7 @@ %include "arrays_java.i" %feature("director") Callback; +SWIG_DIRECTOR_OWNED(Callback) %ignore sample_thread; %ignore pin_ctx; diff --git a/src/rpr220/javaupm_rpr220.i b/src/rpr220/javaupm_rpr220.i index f6d6e5e5..95c56307 100644 --- a/src/rpr220/javaupm_rpr220.i +++ b/src/rpr220/javaupm_rpr220.i @@ -3,7 +3,7 @@ %feature("director") IsrCallback; - +SWIG_DIRECTOR_OWNED(IsrCallback) %ignore generic_callback_isr; %include "../IsrCallback.h" diff --git a/src/ttp223/javaupm_ttp223.i b/src/ttp223/javaupm_ttp223.i index a1595ef7..74435172 100644 --- a/src/ttp223/javaupm_ttp223.i +++ b/src/ttp223/javaupm_ttp223.i @@ -3,7 +3,7 @@ %include "../upm.i" %feature("director") IsrCallback; - +SWIG_DIRECTOR_OWNED(IsrCallback) %ignore generic_callback_isr; %include "../IsrCallback.h"