Merge pull request joeferner#60 from mscdex/misc-fixes

joeferner · joeferner · commit 998d63972ba1 · 2013-08-24T11:20:07.000-07:00
Misc fixes
diff --git a/src/java.cpp b/src/java.cpp
@@ -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();
@@ -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);
@@ -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()));
   }
 
@@ -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();
@@ -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();
@@ -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) {
@@ -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);
@@ -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();
@@ -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) {
diff --git a/src/javaObject.cpp b/src/javaObject.cpp
@@ -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);
 
@@ -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);
 
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -665,7 +665,7 @@ std::string methodNotFoundToString(JNIEnv *env, jclass clazz, std::string method`
`665`	`665`	`}`
`666`	`666`
`667`	`667`	`int count = 0;`
`668`		`- for(std::list<jobject>::iterator it = methods.begin(); it != methods.end(); it++) {`
	`668`	`+ for(std::list<jobject>::iterator it = methods.begin(); it != methods.end(); ++it) {`
`669`	`669`	`jstring methodNameTestJava = (jstring)env->CallObjectMethod(*it, member_getName);`
`670`	`670`	`std::string methodNameTest = javaToString(env, methodNameTestJava);`
`671`	`671`	`if(methodNameTest == methodName) {`