Skip to content

Commit 28be33a

Browse files
Kathy Grayfacebook-github-bot
Kathy Gray
authored andcommittedFeb 1, 2018
Remove release from ReadableNativeArray and Map
Reviewed By: mhorowitz Differential Revision: D6846268 fbshipit-source-id: 2f750a05ee63a744e7f64b3fe67736df3614ef3d
1 parent 88980f2 commit 28be33a

File tree

2 files changed

+14
-22
lines changed

2 files changed

+14
-22
lines changed
 

‎ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp

+5-10
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,24 @@ local_ref<JArrayClass<jobject>> ReadableNativeArray::importArray() {
6666
break;
6767
}
6868
case folly::dynamic::Type::BOOL: {
69-
jarray->
70-
setElement(i,
71-
JBoolean::valueOf(ReadableNativeArray::getBoolean(i)).release());
69+
(*jarray)[i] = JBoolean::valueOf(ReadableNativeArray::getBoolean(i));
7270
break;
7371
}
7472
case folly::dynamic::Type::INT64:
7573
case folly::dynamic::Type::DOUBLE: {
76-
jarray->setElement(i,
77-
JDouble::valueOf(ReadableNativeArray::getDouble(i)).release());
74+
(*jarray)[i] = JDouble::valueOf(ReadableNativeArray::getDouble(i));
7875
break;
7976
}
8077
case folly::dynamic::Type::STRING: {
81-
jarray->
82-
setElement(i,
83-
make_jstring(ReadableNativeArray::getString(i)).release());
78+
(*jarray)[i] = make_jstring(ReadableNativeArray::getString(i));
8479
break;
8580
}
8681
case folly::dynamic::Type::OBJECT: {
87-
jarray->setElement(i,ReadableNativeArray::getMap(i).release());
82+
(*jarray)[i] = ReadableNativeArray::getMap(i);
8883
break;
8984
}
9085
case folly::dynamic::Type::ARRAY: {
91-
jarray->setElement(i,ReadableNativeArray::getArray(i).release());
86+
(*jarray)[i] = ReadableNativeArray::getArray(i);
9287
break;
9388
}
9489
default:

‎ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp

+9-12
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ local_ref<JArrayClass<jstring>> ReadableNativeMap::importKeys() {
2626
jint size = keys_.value().size();
2727
auto jarray = JArrayClass<jstring>::newArray(size);
2828
for (jint i = 0; i < size; i++) {
29-
jarray->setElement(i, make_jstring(keys_.value()[i].getString().c_str()).release());
29+
(*jarray)[i] = make_jstring(keys_.value()[i].getString());
3030
}
3131
return jarray;
3232
}
@@ -43,29 +43,26 @@ local_ref<JArrayClass<jobject>> ReadableNativeMap::importValues() {
4343
break;
4444
}
4545
case folly::dynamic::Type::BOOL: {
46-
jarray->
47-
setElement(i,
48-
JBoolean::valueOf(ReadableNativeMap::getBooleanKey(key)).release());
46+
(*jarray)[i] =
47+
JBoolean::valueOf(ReadableNativeMap::getBooleanKey(key));
4948
break;
5049
}
5150
case folly::dynamic::Type::INT64:
5251
case folly::dynamic::Type::DOUBLE: {
53-
jarray->setElement(i,
54-
JDouble::valueOf(ReadableNativeMap::getDoubleKey(key)).release());
52+
(*jarray)[i] =
53+
JDouble::valueOf(ReadableNativeMap::getDoubleKey(key));
5554
break;
5655
}
5756
case folly::dynamic::Type::STRING: {
58-
jarray->
59-
setElement(i,
60-
ReadableNativeMap::getStringKey(key).release());
57+
(*jarray)[i] = ReadableNativeMap::getStringKey(key);
6158
break;
6259
}
6360
case folly::dynamic::Type::OBJECT: {
64-
jarray->setElement(i,ReadableNativeMap::getMapKey(key).release());
61+
(*jarray)[i] = ReadableNativeMap::getMapKey(key);
6562
break;
6663
}
6764
case folly::dynamic::Type::ARRAY: {
68-
jarray->setElement(i,ReadableNativeMap::getArrayKey(key).release());
65+
(*jarray)[i] = ReadableNativeMap::getArrayKey(key);
6966
break;
7067
}
7168
default: {
@@ -82,7 +79,7 @@ local_ref<JArrayClass<jobject>> ReadableNativeMap::importTypes() {
8279
auto jarray = JArrayClass<jobject>::newArray(size);
8380
for (jint i = 0; i < size; i++) {
8481
std::string key = keys_.value()[i].getString().c_str();
85-
jarray->setElement(i, ReadableNativeMap::getValueType(key).release());
82+
(*jarray)[i] = ReadableNativeMap::getValueType(key);
8683
}
8784
return jarray;
8885
}

0 commit comments

Comments
 (0)
Please sign in to comment.