commit d631ed36f101921e4051173f536a24a530ec442b
author Brett Porter <brett@apache.org> Tue Jul 08 05:09:35 2014 +0000
committer Brett Porter <brett@apache.org> Tue Jul 08 05:09:35 2014 +0000
tree 06a8479841fda19224941b6e3a5269de438b399f
parent 26c87de37f0d58088146292df2beeb41670ecd23

[NPANDAY-505] support recursive registry lookups

Avoid NPE

git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/trunk@1608660 13f79535-47bb-0310-9956-ffa450edef68

components/dotnet-registry/src/main/java/npanday/registry/impl/WinRegistry.java

diff --git a/components/dotnet-registry/src/main/java/npanday/registry/impl/WinRegistry.java b/components/dotnet-registry/src/main/java/npanday/registry/impl/WinRegistry.java
index 7aabf22..c519cf1 100644
--- a/components/dotnet-registry/src/main/java/npanday/registry/impl/WinRegistry.java
+++ b/components/dotnet-registry/src/main/java/npanday/registry/impl/WinRegistry.java
@@ -521,9 +521,11 @@
         try
         {
             String value = WinRegistry.readString( registryHKey.getHKey(), key, valueName );
-            Matcher m = REGISTRY_REFERENCE_REGEX.matcher(value);
-            if (m.matches()) {
-                value = getValue(RegistryHKey.tryGetFromName(m.group(1)), m.group(2), m.group(3));
+            if (value != null) {
+                Matcher m = REGISTRY_REFERENCE_REGEX.matcher(value);
+                if (m.matches()) {
+                    value = getValue(RegistryHKey.tryGetFromName(m.group(1)), m.group(2), m.group(3));
+                }
             }
             return value;
         }