Skip to content

Commit 485600f

Browse files
committed
removed attach detach logic from debugger (no need with node like implementation)
1 parent 4858cc9 commit 485600f

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

src/jni/JEnv.cpp

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ using namespace std;
1313

1414

1515

16-
JEnv::JEnv(bool detach)
17-
: m_detach(detach), m_env(nullptr)
16+
JEnv::JEnv()
17+
: m_env(nullptr)
1818
{
1919
JNIEnv *env = nullptr;
2020
jint ret = s_jvm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
@@ -29,29 +29,12 @@ JEnv::JEnv(bool detach)
2929
}
3030

3131
JEnv::JEnv(JNIEnv *jniEnv)
32-
: m_env(jniEnv), m_detach(false)
32+
: m_env(jniEnv)
3333
{
3434
}
3535

3636
JEnv::~JEnv()
3737
{
38-
if (m_detach)
39-
{
40-
pid_t pid = getpid();
41-
pid_t tid = gettid();
42-
43-
if (pid != tid)
44-
{
45-
JNIEnv *env = nullptr;
46-
jint ret = s_jvm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
47-
48-
if ((ret == JNI_OK) && (env != nullptr))
49-
{
50-
jint ret = s_jvm->DetachCurrentThread();
51-
assert(ret == JNI_OK);
52-
}
53-
}
54-
}
5538
}
5639

5740
JEnv::operator JNIEnv*() const

src/jni/JEnv.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace tns
1010
class JEnv
1111
{
1212
public:
13-
JEnv(bool detach = false);
13+
JEnv();
1414

1515
JEnv(JNIEnv *jniEnv);
1616

@@ -324,7 +324,6 @@ namespace tns
324324
void CheckForJavaException();
325325

326326
JNIEnv *m_env;
327-
bool m_detach;
328327

329328
static JavaVM *s_jvm;
330329

0 commit comments

Comments
 (0)