Attachment 104274 Details for Bug 233866 – Trivial patch to avoid the NPE

[patch] Trivial patch to avoid the NPE

patch.txt (text/plain), 1.54 KB, created by Enrico Ehrich

on 2008-06-10 02:03:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Enrico Ehrich

Created: 2008-06-10 02:03:35 EDT

Size: 1.54 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.managedbuilder.gnu.ui
>Index: src/org/eclipse/cdt/managedbuilder/gnu/cygwin/CygwinPathResolver.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/CygwinPathResolver.java,v
>retrieving revision 1.10
>diff -u -r1.10 CygwinPathResolver.java
>--- src/org/eclipse/cdt/managedbuilder/gnu/cygwin/CygwinPathResolver.java	15 Feb 2008 12:53:06 -0000	1.10
>+++ src/org/eclipse/cdt/managedbuilder/gnu/cygwin/CygwinPathResolver.java	10 Jun 2008 05:57:27 -0000
>@@ -133,12 +133,16 @@
> 	private static String read(boolean user, String pattern) {
> 		String tail = EMPTY; 
> 		while (pattern.length() > 0) {
>-			String key = REGISTRY_KEY + pattern;
>-			String s = user ?
>-				WindowsRegistry.getRegistry().getCurrentUserValue(key, PATH_NAME) :
>-				WindowsRegistry.getRegistry().getLocalMachineValue(key, PATH_NAME);
>-			if (s != null) 
>-				return (s.concat(tail).replaceAll(BSLASH, SSLASH));
>+			String key = REGISTRY_KEY + pattern;			
>+			WindowsRegistry registry = WindowsRegistry.getRegistry(); 
>+			if (null != registry) {
>+				String s = user ?
>+					registry.getCurrentUserValue(key, PATH_NAME) :
>+					registry.getLocalMachineValue(key, PATH_NAME);
>+
>+				if (s != null) 
>+					return (s.concat(tail).replaceAll(BSLASH, SSLASH));
>+			}
> 			if (pattern.equals(ROOTPATTERN)) 
> 				break; // no other paths to search 
> 			int pos = pattern.lastIndexOf(SLASH);

Flags:

cdtdoug: iplog+

Actions: View | Diff

Attachments on bug 233866: 104274