merge in jb-release history after reset to jb-dev
diff --git a/android/net/android_network_library_impl.cc b/android/net/android_network_library_impl.cc
index 1989621..433ca61 100644
--- a/android/net/android_network_library_impl.cc
+++ b/android/net/android_network_library_impl.cc
@@ -105,6 +105,11 @@
}
env->DeleteLocalRef(error);
}
+ } else {
+ // an uncaught exception has happened in java code, clear it and return
+ // a proper error
+ env->ExceptionClear();
+ result = VERIFY_INVOCATION_ERROR;
}
// TODO(joth): This balances the GetJNIEnv call; we need to detach as
// currently this method is called in chrome from a worker pool thread that
