From 64844d900ac60f3f2a28aed1da081e8a3dbff04e Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Wed, 21 Apr 2021 10:22:31 -0700
Subject: [PATCH] Refactor names of ReadableMapBuffer class variables

Summary:
Refactor names of ReadableMapBuffer class variables

changelog: [internal] internal

Reviewed By: sammy-SC

Differential Revision: D27867056

fbshipit-source-id: de96429cbd1142e14fa74f7f953d560ba5918954
---
 .../react/common/mapbuffer/ReadableMapBuffer.cpp   | 14 ++++++++------
 .../jni/react/common/mapbuffer/ReadableMapBuffer.h | 12 ++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp
index a04dfe95837..f8042542745 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.cpp
@@ -26,9 +26,9 @@ ReadableMapBuffer::importByteBufferAllocateDirect() {
   // steps:
   // - Validate perf of this method vs importByteBuffer
   // - Validate that there's no leaking of memory
-  auto ret = jni::JByteBuffer::allocateDirect(_serializedDataSize);
+  auto ret = jni::JByteBuffer::allocateDirect(serializedDataSize_);
   std::memcpy(
-      ret->getDirectBytes(), (void *)_serializedData, _serializedDataSize);
+      ret->getDirectBytes(), (void *)serializedData_, serializedDataSize_);
   return ret;
 }
 
@@ -47,7 +47,7 @@ jni::JByteBuffer::javaobject ReadableMapBuffer::importByteBuffer() {
   // transfer data of multitple Maps
   return static_cast<jni::JByteBuffer::javaobject>(
       jni::Environment::current()->NewDirectByteBuffer(
-          (void *)_serializedData, _serializedDataSize));
+          (void *)serializedData_, serializedDataSize_));
 }
 
 jni::local_ref<ReadableMapBuffer::jhybridobject>
@@ -56,9 +56,11 @@ ReadableMapBuffer::createWithContents(MapBuffer &&map) {
 }
 
 ReadableMapBuffer::~ReadableMapBuffer() {
-  delete[] _serializedData;
-  _serializedData = nullptr;
-  _serializedDataSize = 0;
+  if (serializedData_ != nullptr) {
+    delete[] serializedData_;
+    serializedData_ = nullptr;
+  }
+  serializedDataSize_ = 0;
 }
 
 } // namespace react
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h
index 6ead62098e0..6a231bd29be 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/ReadableMapBuffer.h
@@ -32,18 +32,18 @@ class ReadableMapBuffer : public jni::HybridClass<ReadableMapBuffer> {
   ~ReadableMapBuffer();
 
  private:
-  uint8_t *_serializedData = nullptr;
+  uint8_t *serializedData_ = nullptr;
 
-  int _serializedDataSize = 0;
+  int serializedDataSize_ = 0;
 
   friend HybridBase;
 
   explicit ReadableMapBuffer(MapBuffer &&map) {
-    _serializedDataSize = map.getBufferSize();
+    serializedDataSize_ = map.getBufferSize();
     react_native_assert(
-        (_serializedDataSize != 0) && "Error no content in map");
-    _serializedData = new Byte[_serializedDataSize];
-    map.copy(_serializedData);
+        (serializedDataSize_ != 0) && "Error no content in map");
+    serializedData_ = new Byte[serializedDataSize_];
+    map.copy(serializedData_);
   }
 };