⚡ Sangsakala Proxy 🏠 Home
Skip to content

Commit 02a945a

Browse files
jsdeveljsdevel
committed
Updating ensure and create Jvm in java.cpp
1 parent ca7a158 commit 02a945a

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎src/java.cpp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ Java::~Java() {
8787
this->destroyJVM(&this->m_jvm, &this->m_env);
8888
}
8989

90-
v8::Handle<v8::Value> Java::ensureJvm() {
90+
v8::Local<v8::Value> Java::ensureJvm() {
9191
if(!m_jvm) {
9292
return createJVM(&this->m_jvm, &this->m_env);
9393
}
9494

95-
NanReturnUndefined();
95+
return NanNull();
9696
}
9797

98-
v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
98+
v8::Local<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
9999
JavaVM* jvmTemp;
100100
JavaVMInitArgs args;
101101

@@ -105,7 +105,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
105105

106106
v8::Local<v8::Value> classPathValue = NanObjectWrapHandle(this)->Get(NanNew<v8::String>("classpath"));
107107
if(!classPathValue->IsArray()) {
108-
return NanThrowTypeError("Classpath must be an array");
108+
return NanTypeError("Classpath must be an array");
109109
}
110110
v8::Handle<v8::Array> classPathArrayTemp = v8::Handle<v8::Array>::Cast(classPathValue);
111111
NanAssignPersistent(m_classPathArray, classPathArrayTemp);
@@ -119,7 +119,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
119119
}
120120
v8::Local<v8::Value> arrayItemValue = classPathArrayTemp->Get(i);
121121
if(!arrayItemValue->IsString()) {
122-
return NanThrowTypeError("Classpath must only contain strings");
122+
return NanTypeError("Classpath must only contain strings");
123123
}
124124
v8::Local<v8::String> arrayItem = arrayItemValue->ToString();
125125
v8::String::Utf8Value arrayItemStr(arrayItem);
@@ -134,7 +134,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
134134
// get other options
135135
v8::Local<v8::Value> optionsValue = NanObjectWrapHandle(this)->Get(NanNew<v8::String>("options"));
136136
if(!optionsValue->IsArray()) {
137-
return NanThrowTypeError("options must be an array");
137+
return NanTypeError("options must be an array");
138138
}
139139
v8::Handle<v8::Array> optionsArrayTemp = v8::Handle<v8::Array>::Cast(optionsValue);
140140
NanAssignPersistent(m_optionsArray, optionsArrayTemp);
@@ -148,7 +148,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
148148
v8::Local<v8::Value> arrayItemValue = optionsArrayTemp->Get(i);
149149
if(!arrayItemValue->IsString()) {
150150
delete[] vmOptions;
151-
return NanThrowTypeError("options must only contain strings");
151+
return NanTypeError("options must only contain strings");
152152
}
153153
v8::Local<v8::String> arrayItem = arrayItemValue->ToString();
154154
v8::String::Utf8Value arrayItemStr(arrayItem);
@@ -170,7 +170,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
170170
NanObjectWrapHandle(this)->SetAccessor(NanNew<v8::String>("options"), AccessorProhibitsOverwritingGetter, AccessorProhibitsOverwritingSetter);
171171
NanObjectWrapHandle(this)->SetAccessor(NanNew<v8::String>("nativeBindingLocation"), AccessorProhibitsOverwritingGetter, AccessorProhibitsOverwritingSetter);
172172

173-
NanReturnUndefined();
173+
return NanNull();
174174
}
175175

176176
NAN_GETTER(Java::AccessorProhibitsOverwritingGetter) {
@@ -194,7 +194,7 @@ NAN_SETTER(Java::AccessorProhibitsOverwritingSetter) {
194194
v8::String::Utf8Value nameStr(property);
195195
std::ostringstream errStr;
196196
errStr << "Cannot set " << *nameStr << " after calling any other java function.";
197-
v8::ThrowException(v8::Exception::Error(NanNew<v8::String>(errStr.str().c_str())));
197+
NanThrowError(errStr.str().c_str());
198198
}
199199

200200
void Java::destroyJVM(JavaVM** jvm, JNIEnv** env) {
@@ -206,8 +206,8 @@ void Java::destroyJVM(JavaVM** jvm, JNIEnv** env) {
206206
NAN_METHOD(Java::getClassLoader) {
207207
NanScope();
208208
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
209-
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
210-
if(!ensureJvmResults->IsUndefined()) {
209+
v8::Local<v8::Value> ensureJvmResults = self->ensureJvm();
210+
if(!ensureJvmResults->IsNull()) {
211211
NanReturnValue(ensureJvmResults);
212212
}
213213
JNIEnv* env = self->getJavaEnv();
@@ -226,7 +226,7 @@ NAN_METHOD(Java::newInstance) {
226226
NanScope();
227227
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
228228
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
229-
if(!ensureJvmResults->IsUndefined()) {
229+
if(!ensureJvmResults->IsNull()) {
230230
NanReturnValue(ensureJvmResults);
231231
}
232232
JNIEnv* env = self->getJavaEnv();
@@ -266,7 +266,7 @@ NAN_METHOD(Java::newInstanceSync) {
266266
NanScope();
267267
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
268268
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
269-
if(!ensureJvmResults->IsUndefined()) {
269+
if(!ensureJvmResults->IsNull()) {
270270
NanReturnValue(ensureJvmResults);
271271
}
272272
JNIEnv* env = self->getJavaEnv();
@@ -309,7 +309,7 @@ NAN_METHOD(Java::newProxy) {
309309
NanScope();
310310
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
311311
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
312-
if(!ensureJvmResults->IsUndefined()) {
312+
if(!ensureJvmResults->IsNull()) {
313313
NanReturnValue(ensureJvmResults);
314314
}
315315
JNIEnv* env = self->getJavaEnv();
@@ -357,15 +357,15 @@ NAN_METHOD(Java::newProxy) {
357357
if(result->IsNativeError()) {
358358
return NanThrowError(result);
359359
}
360-
dynamicProxyData->jsObject = v8::Persistent<v8::Value>::New(result);
360+
NanAssignPersistent(dynamicProxyData->jsObject, result);
361361
NanReturnValue(result);
362362
}
363363

364364
NAN_METHOD(Java::callStaticMethod) {
365365
NanScope();
366366
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
367367
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
368-
if(!ensureJvmResults->IsUndefined()) {
368+
if(!ensureJvmResults->IsNull()) {
369369
NanReturnValue(ensureJvmResults);
370370
}
371371
JNIEnv* env = self->getJavaEnv();
@@ -406,7 +406,7 @@ NAN_METHOD(Java::callStaticMethodSync) {
406406
NanScope();
407407
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
408408
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
409-
if(!ensureJvmResults->IsUndefined()) {
409+
if(!ensureJvmResults->IsNull()) {
410410
NanReturnValue(ensureJvmResults);
411411
}
412412
JNIEnv* env = self->getJavaEnv();
@@ -450,7 +450,7 @@ NAN_METHOD(Java::findClassSync) {
450450
NanScope();
451451
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
452452
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
453-
if(!ensureJvmResults->IsUndefined()) {
453+
if(!ensureJvmResults->IsNull()) {
454454
NanReturnValue(ensureJvmResults);
455455
}
456456
JNIEnv* env = self->getJavaEnv();
@@ -478,7 +478,7 @@ NAN_METHOD(Java::newArray) {
478478
NanScope();
479479
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
480480
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
481-
if(!ensureJvmResults->IsUndefined()) {
481+
if(!ensureJvmResults->IsNull()) {
482482
NanReturnValue(ensureJvmResults);
483483
}
484484
JNIEnv* env = self->getJavaEnv();
@@ -587,7 +587,7 @@ NAN_METHOD(Java::newByte) {
587587
NanScope();
588588
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
589589
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
590-
if(!ensureJvmResults->IsUndefined()) {
590+
if(!ensureJvmResults->IsNull()) {
591591
NanReturnValue(ensureJvmResults);
592592
}
593593
JNIEnv* env = self->getJavaEnv();
@@ -615,7 +615,7 @@ NAN_METHOD(Java::newShort) {
615615
NanScope();
616616
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
617617
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
618-
if(!ensureJvmResults->IsUndefined()) {
618+
if(!ensureJvmResults->IsNull()) {
619619
NanReturnValue(ensureJvmResults);
620620
}
621621
JNIEnv* env = self->getJavaEnv();
@@ -643,7 +643,7 @@ NAN_METHOD(Java::newLong) {
643643
NanScope();
644644
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
645645
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
646-
if(!ensureJvmResults->IsUndefined()) {
646+
if(!ensureJvmResults->IsNull()) {
647647
NanReturnValue(ensureJvmResults);
648648
}
649649
JNIEnv* env = self->getJavaEnv();
@@ -671,7 +671,7 @@ NAN_METHOD(Java::newChar) {
671671
NanScope();
672672
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
673673
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
674-
if(!ensureJvmResults->IsUndefined()) {
674+
if(!ensureJvmResults->IsNull()) {
675675
NanReturnValue(ensureJvmResults);
676676
}
677677
JNIEnv* env = self->getJavaEnv();
@@ -708,7 +708,7 @@ NAN_METHOD(Java::newFloat) {
708708
NanScope();
709709
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
710710
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
711-
if(!ensureJvmResults->IsUndefined()) {
711+
if(!ensureJvmResults->IsNull()) {
712712
NanReturnValue(ensureJvmResults);
713713
}
714714
JNIEnv* env = self->getJavaEnv();
@@ -732,7 +732,7 @@ NAN_METHOD(Java::newDouble) {
732732
NanScope();
733733
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
734734
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
735-
if(!ensureJvmResults->IsUndefined()) {
735+
if(!ensureJvmResults->IsNull()) {
736736
NanReturnValue(ensureJvmResults);
737737
}
738738
JNIEnv* env = self->getJavaEnv();
@@ -756,7 +756,7 @@ NAN_METHOD(Java::getStaticFieldValue) {
756756
NanScope();
757757
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
758758
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
759-
if(!ensureJvmResults->IsUndefined()) {
759+
if(!ensureJvmResults->IsNull()) {
760760
NanReturnValue(ensureJvmResults);
761761
}
762762
JNIEnv* env = self->getJavaEnv();
@@ -802,7 +802,7 @@ NAN_METHOD(Java::setStaticFieldValue) {
802802
NanScope();
803803
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
804804
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
805-
if(!ensureJvmResults->IsUndefined()) {
805+
if(!ensureJvmResults->IsNull()) {
806806
NanReturnValue(ensureJvmResults);
807807
}
808808
JNIEnv* env = self->getJavaEnv();
@@ -859,7 +859,7 @@ NAN_METHOD(Java::instanceOf) {
859859
NanScope();
860860
Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
861861
v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
862-
if(!ensureJvmResults->IsUndefined()) {
862+
if(!ensureJvmResults->IsNull()) {
863863
NanReturnValue(ensureJvmResults);
864864
}
865865
JNIEnv* env = self->getJavaEnv();

‎src/java.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Java : public node::ObjectWrap {
1818
private:
1919
Java();
2020
~Java();
21-
v8::Handle<v8::Value> createJVM(JavaVM** jvm, JNIEnv** env);
21+
v8::Local<v8::Value> createJVM(JavaVM** jvm, JNIEnv** env);
2222
void destroyJVM(JavaVM** jvm, JNIEnv** env);
2323

2424
static NAN_METHOD(New);
@@ -41,7 +41,7 @@ class Java : public node::ObjectWrap {
4141
static NAN_METHOD(instanceOf);
4242
static NAN_GETTER(AccessorProhibitsOverwritingGetter);
4343
static NAN_SETTER(AccessorProhibitsOverwritingSetter);
44-
v8::Handle<v8::Value> ensureJvm();
44+
v8::Local<v8::Value> ensureJvm();
4545

4646
static v8::Persistent<v8::FunctionTemplate> s_ct;
4747
JavaVM* m_jvm;

0 commit comments

Comments
 (0)