Skip to content

Misc fixes #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joeferner merged 3 commits into from
Aug 24, 2013
Merged

Misc fixes #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73904f5
Remove unused variables
mscdex Aug 24, 2013
ccbc0b6
Fix memory leaks on exception
mscdex Aug 24, 2013
b64f8ba
Use pre-increment for iterators
mscdex Aug 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/java.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
for(uint32_t i=0; i<optionsArray->Length(); i++) {
v8::Local<v8::Value> arrayItemValue = optionsArray->Get(i);
if(!arrayItemValue->IsString()) {
delete[] vmOptions;
return ThrowException(v8::Exception::TypeError(v8::String::New("options must only contain strings")));
}
v8::Local<v8::String> arrayItem = arrayItemValue->ToString();
Expand Down Expand Up @@ -270,8 +271,6 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
JavaScope javaScope(env);

int argsStart = 0;
int argsEnd = args.Length();
UNUSED_VARIABLE(argsEnd);

ARGS_FRONT_STRING(interfaceName);
ARGS_FRONT_OBJECT(functions);
Expand All @@ -289,6 +288,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
if(clazz == NULL) {
std::ostringstream errStr;
errStr << "Could not create class node/NodeDynamicProxyClass";
delete dynamicProxyData;
return ThrowException(javaExceptionToV8(env, errStr.str()));
}

Expand Down Expand Up @@ -411,8 +411,6 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
JavaScope javaScope(env);

int argsStart = 0;
int argsEnd = args.Length();
UNUSED_VARIABLE(argsEnd);

// arguments
ARGS_FRONT_CLASSNAME();
Expand Down Expand Up @@ -441,7 +439,6 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
JavaScope javaScope(env);

int argsStart = 0;
int argsEnd = args.Length();

// arguments
ARGS_FRONT_CLASSNAME();
Expand All @@ -454,8 +451,6 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
}
v8::Local<v8::Array> arrayObj = v8::Local<v8::Array>::Cast(args[argsStart]);

UNUSED_VARIABLE(argsEnd);

// find class and method
jarray results;
if(strcmp(className.c_str(), "byte") == 0) {
Expand Down Expand Up @@ -551,12 +546,10 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
JavaScope javaScope(env);

int argsStart = 0;
int argsEnd = args.Length();

// arguments
ARGS_FRONT_CLASSNAME();
ARGS_FRONT_STRING(fieldName);
UNUSED_VARIABLE(argsEnd);

// find the class
jclass clazz = javaFindClass(env, className);
Expand Down Expand Up @@ -599,7 +592,6 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
JavaScope javaScope(env);

int argsStart = 0;
int argsEnd = args.Length();

// arguments
ARGS_FRONT_CLASSNAME();
Expand All @@ -614,8 +606,6 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
jobject newValue = v8ToJava(env, args[argsStart]);
argsStart++;

UNUSED_VARIABLE(argsEnd);

// find the class
jclass clazz = javaFindClass(env, className);
if(clazz == NULL) {
Expand Down
4 changes: 2 additions & 2 deletions src/javaObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
javaReflectionGetMethods(env, objClazz, &methods, false);
jclass methodClazz = env->FindClass("java/lang/reflect/Method");
jmethodID method_getName = env->GetMethodID(methodClazz, "getName", "()Ljava/lang/String;");
for(std::list<jobject>::iterator it = methods.begin(); it != methods.end(); it++) {
for(std::list<jobject>::iterator it = methods.begin(); it != methods.end(); ++it) {
jstring methodNameJava = (jstring)env->CallObjectMethod(*it, method_getName);
std::string methodNameStr = javaToString(env, methodNameJava);

Expand All @@ -60,7 +60,7 @@
javaReflectionGetFields(env, objClazz, &fields);
jclass fieldClazz = env->FindClass("java/lang/reflect/Field");
jmethodID field_getName = env->GetMethodID(fieldClazz, "getName", "()Ljava/lang/String;");
for(std::list<jobject>::iterator it = fields.begin(); it != fields.end(); it++) {
for(std::list<jobject>::iterator it = fields.begin(); it != fields.end(); ++it) {
jstring fieldNameJava = (jstring)env->CallObjectMethod(*it, field_getName);
std::string fieldNameStr = javaToString(env, fieldNameJava);

Expand Down
2 changes: 1 addition & 1 deletion src/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ std::string methodNotFoundToString(JNIEnv *env, jclass clazz, std::string method
}

int count = 0;
for(std::list<jobject>::iterator it = methods.begin(); it != methods.end(); it++) {
for(std::list<jobject>::iterator it = methods.begin(); it != methods.end(); ++it) {
jstring methodNameTestJava = (jstring)env->CallObjectMethod(*it, member_getName);
std::string methodNameTest = javaToString(env, methodNameTestJava);
if(methodNameTest == methodName) {
Expand Down