Attachment 93681 Details for Bug 224190 – Patch to include additional null checking

[patch] Patch to include additional null checking

navigator_npe_patch.txt (text/plain), 1.25 KB, created by Justin Berstler

on 2008-03-26 16:13:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Berstler

Created: 2008-03-26 16:13:17 EDT

Size: 1.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.navigator
>Index: src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java,v
>retrieving revision 1.6
>diff -u -r1.6 NavigatorActivationService.java
>--- src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java	11 Apr 2007 15:09:33 -0000	1.6
>+++ src/org/eclipse/ui/internal/navigator/NavigatorActivationService.java	26 Mar 2008 20:03:54 -0000
>@@ -98,11 +98,11 @@
> 			return b.booleanValue();
> 		synchronized (activatedExtensionsMap) {
> 			NavigatorContentDescriptor descriptor = CONTENT_DESCRIPTOR_REGISTRY.getContentDescriptor(aNavigatorExtensionId);
>-			if(descriptor.isActiveByDefault())
>+			if( descriptor == null || descriptor.isActiveByDefault() )
> 				activatedExtensionsMap.put(aNavigatorExtensionId, Boolean.TRUE);
> 			else
> 				activatedExtensionsMap.put(aNavigatorExtensionId, Boolean.FALSE);
>-			return descriptor.isActiveByDefault();
>+			return descriptor == null ? true : descriptor.isActiveByDefault();
> 		}
> 		//return activatedExtensions.contains(aNavigatorExtensionId);
> 	}

Actions: View | Diff

Attachments on bug 224190: 93681