Skip to content

Commit 88390c1

Browse files
author
Mihail Slavchev
committed
remove unused constructor
1 parent 8a87431 commit 88390c1

2 files changed

Lines changed: 13 additions & 26 deletions

File tree

src/jni/JniLocalRef.cpp

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,27 @@ using namespace tns;
77

88
JniLocalRef::JniLocalRef()
99
:
10-
m_obj(nullptr), m_isWeak(false)
10+
m_obj(nullptr)
1111
{
1212
}
1313

14-
JniLocalRef::JniLocalRef(jobject obj, bool isWeak)
14+
JniLocalRef::JniLocalRef(jobject obj)
1515
:
16-
m_obj(obj), m_isWeak(isWeak)
16+
m_obj(obj)
1717
{
1818
}
1919

2020
JniLocalRef::JniLocalRef(jclass obj)
2121
:
22-
m_obj(obj), m_isWeak(false)
22+
m_obj(obj)
2323
{
2424
}
2525

2626
JniLocalRef::JniLocalRef(const JniLocalRef& rhs)
2727
{
2828
JEnv env;
2929

30-
m_obj = rhs.m_isWeak ? rhs.m_obj : env.NewLocalRef(rhs.m_obj);
31-
m_isWeak = rhs.m_isWeak;
30+
m_obj = env.NewLocalRef(rhs.m_obj);
3231
}
3332

3433
bool JniLocalRef::IsNull() const
@@ -40,23 +39,14 @@ JniLocalRef& JniLocalRef::operator=(const JniLocalRef& rhs)
4039
{
4140
if (this != &rhs)
4241
{
43-
m_isWeak = rhs.m_isWeak;
44-
if (m_isWeak)
45-
{
46-
m_obj = rhs.m_obj;
47-
}
48-
else
42+
JEnv env;
43+
if (m_obj != nullptr)
4944
{
50-
JEnv env;
51-
if (m_obj != nullptr)
52-
{
53-
env.DeleteLocalRef(m_obj);
54-
}
55-
m_obj = (rhs.m_obj != nullptr)
56-
? env.NewLocalRef(rhs.m_obj)
57-
:
58-
nullptr;
45+
env.DeleteLocalRef(m_obj);
5946
}
47+
m_obj = (rhs.m_obj != nullptr)
48+
? env.NewLocalRef(rhs.m_obj)
49+
: nullptr;
6050
}
6151
return *this;
6252
}
@@ -139,7 +129,7 @@ JniLocalRef::operator jobjectArray() const
139129

140130
JniLocalRef::~JniLocalRef()
141131
{
142-
if ((m_obj != nullptr) && !m_isWeak)
132+
if (m_obj != nullptr)
143133
{
144134
JEnv env;
145135
env.DeleteLocalRef(m_obj);

src/jni/JniLocalRef.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace tns
1111
public:
1212
JniLocalRef();
1313

14-
JniLocalRef(jobject obj, bool isWeak = false);
14+
JniLocalRef(jobject obj);
1515

1616
JniLocalRef(jclass obj);
1717

@@ -54,10 +54,7 @@ namespace tns
5454
operator jobjectArray() const;
5555

5656
private:
57-
5857
jobject m_obj;
59-
60-
bool m_isWeak;
6158
};
6259
}
6360

0 commit comments

Comments
 (0)