[TIMOB-25963] Improve jsstring validation, rename to nativeStack

tidev · Apr 26, 2018 · 9d1044e · 9d1044e
1 parent dc2d097
commit 9d1044e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/android/runtime/v8/src/native/JSException.cpp b/android/runtime/v8/src/native/JSException.cpp
@@ -73,7 +73,7 @@ Local<Value> JSException::fromJavaException(v8::Isolate* isolate, jthrowable jav
 
 	// Now explicitly assign our properly generated stacktrace
 	Local<String> javaStack = String::NewFromUtf8(isolate, stackStream.str().c_str());
-	error->Set(context, STRING_NEW(isolate, "javaStack"), javaStack);
+	error->Set(context, STRING_NEW(isolate, "nativeStack"), javaStack);
 
 	// throw it
 	return isolate->ThrowException(error);

diff --git a/android/runtime/v8/src/native/TypeConverter.cpp b/android/runtime/v8/src/native/TypeConverter.cpp
@@ -114,7 +114,7 @@ jstring TypeConverter::jsValueToJavaString(v8::Isolate* isolate, v8::Local<v8::V
 
 jstring TypeConverter::jsValueToJavaString(v8::Isolate* isolate, JNIEnv *env, v8::Local<v8::Value> jsValue)
 {
-	if (jsValue->IsNull()) {
+	if (jsValue->IsNullOrUndefined()) {
 		return NULL;
 	}
 

diff --git a/android/runtime/v8/src/native/V8Util.cpp b/android/runtime/v8/src/native/V8Util.cpp
@@ -155,8 +155,8 @@ void V8Util::openJSErrorDialog(Isolate* isolate, TryCatch &tryCatch)
 
 	if (exception->IsObject()) {
 		Local<Object> error = exception.As<Object>();
-		jsStack = exception.As<Object>()->Get(STRING_NEW(isolate, "stack"));
-		javaStack = exception.As<Object>()->Get(STRING_NEW(isolate, "javaStack"));
+		jsStack = error->Get(STRING_NEW(isolate, "stack"));
+		javaStack = error->Get(STRING_NEW(isolate, "nativeStack"));
 	}
 
 	// obtain javascript stack trace

diff --git a/tests/Resources/ti.addontest.js b/tests/Resources/ti.addontest.js
@@ -24,7 +24,7 @@ describe('Error', function () {
 			ex.should.have.property('stack');
 			ex.stack.should.containEql('TypeError: Cannot read property \'crash\' of undefined');
 			// does not have java stack trace
-			ex.should.not.have.property('javaStack');
+			ex.should.not.have.property('nativeStack');
 		}
 	});
 
@@ -39,8 +39,8 @@ describe('Error', function () {
 			ex.should.have.property('stack');
 			ex.stack.should.containEql('Error: Unable to convert null'); // TODO Verify app.js in stack?
 			// has special javaStack property for java stacktrace
-			ex.should.have.property('javaStack');
-			ex.javaStack.should.containEql('org.appcelerator.titanium.util.TiConvert.toInt(TiConvert.java:'); // points to Java code in stack
+			ex.should.have.property('nativeStack');
+			ex.nativeStack.should.containEql('org.appcelerator.titanium.util.TiConvert.toInt(TiConvert.java:'); // points to Java code in stack
 		}
 	});
 
@@ -51,7 +51,7 @@ describe('Error', function () {
 			ex.should.equal('this is my error string');
 			ex.should.not.have.property('message');
 			ex.should.not.have.property('stack');
-			ex.should.not.have.property('javaStack');
+			ex.should.not.have.property('nativeStack');
 		}
 	});
 });