From 13d680ecd63f822ec163bc0a6d6914e4b78d5ed6 Mon Sep 17 00:00:00 2001
From: marscher <m.scherer@fu-berlin.de>
Date: Wed, 29 Oct 2014 20:18:30 +0100
Subject: [PATCH] [JVMFinder] do not raise NotImplementedError, but return None
 (old behaviour)

---
 jpype/_darwin.py  | 1 -
 jpype/_windows.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/jpype/_darwin.py b/jpype/_darwin.py
index a078a5373..c99e82fc1 100644
--- a/jpype/_darwin.py
+++ b/jpype/_darwin.py
@@ -65,7 +65,6 @@ def _javahome_binary(self):
             else:
                 java_home = subprocess.Popen(['/usr/libexec/java_home'], stdout=subprocess.PIPE).communicate()[0]
             return java_home
-        raise NotImplementedError
 
 # ------------------------------------------------------------------------------
 
diff --git a/jpype/_windows.py b/jpype/_windows.py
index f1d00daa2..a7ae34242 100644
--- a/jpype/_windows.py
+++ b/jpype/_windows.py
@@ -59,5 +59,5 @@ def _get_from_registry(self):
             return cv[0]
 
         except WindowsError:
-            raise NotImplementedError
+            return None