Prevent ByteArray and UtfString from being prematurely cleaned up

project-chip · Nov 30, 2021 · 3b587e5 · 3b587e5
1 parent 800bd23
commit 3b587e5
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 36 deletions.
diff --git a/src/controller/java/templates/partials/decode_value.zapt b/src/controller/java/templates/partials/decode_value.zapt
@@ -16,9 +16,11 @@ if ({{source}}.Value().IsNull()) {
 {{else if isStruct}}
 {{asSymbol label}} = nullptr; /* Struct - conversion from this type to Java is not properly implemented yet */
 {{else if (isOctetString type)}}
-{{target}} = chip::ByteArray(env, {{>item}}).jniValue();
+chip::ByteArray {{target}}ByteArray(env, {{>item}});
+{{target}} = {{target}}ByteArray.jniValue();
 {{else if (isCharString type)}}
-{{target}} = chip::UtfString(env, {{>item}}).jniValue();
+chip::UtfString {{target}}UtfString(env, {{>item}});
+{{target}} = {{target}}UtfString.jniValue();
 {{else}}
 std::string {{target}}ClassName = "java/lang/{{asJavaBasicTypeForZclType type true}}";
 std::string {{target}}CtorSignature = "({{asJniSignature type false}})V";

diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp