From d2a21b5fc979b07794cd42ad551dd5f4f996fdc6 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 21 Oct 2014 23:39:14 +0200
Subject: Fix crash when Swiften isn't loaded dynamically via JNI.

Test-Information:

This change re-enables pushing our integration tests to an android device or vm
and running them successfully. These executables are statically build and linked
against Swiften, so no Java environment will be available at runtime.

Change-Id: I3a156cc38c062a47084c73d05a0b1383c963ec2a

diff --git a/3rdParty/Unbound/src/android/dns/dns_android.cpp b/3rdParty/Unbound/src/android/dns/dns_android.cpp
index 4b1c368..d7cfa15 100644
--- a/3rdParty/Unbound/src/android/dns/dns_android.cpp
+++ b/3rdParty/Unbound/src/android/dns/dns_android.cpp
@@ -18,6 +18,9 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*aReserved*/) {
 
 std::vector<std::string> get_servers() {
   std::vector<std::string> servers;
+  if (javaVM == 0) {
+    return servers;
+  }
 
   JNIEnv* env = 0;
   int result = javaVM->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
-- 
cgit v0.10.2-6-g49f6