Attachment 39032 Details for Bug 137281 – This patch guards against NPE's in the pathmap manager.

[patch] This patch guards against NPE's in the pathmap manager.

bugzilla137281.patch (text/plain), 1.62 KB, created by Chris McGee

on 2006-04-20 10:20:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris McGee

Created: 2006-04-20 10:20:39 EDT

Size: 1.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.emf.core
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/resources/PathmapManager.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/PathmapManager.java,v
>retrieving revision 1.2
>diff -u -r1.2 PathmapManager.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/resources/PathmapManager.java	7 Apr 2006 14:51:25 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/resources/PathmapManager.java	20 Apr 2006 14:09:19 -0000
>@@ -428,7 +428,11 @@
> 				denormalize((Resource) msg.getNewValue(), getResourceSet().getURIConverter());
> 				break;
> 			case Notification.ADD_MANY:
>-				for (Iterator i = ((List)msg.getNewValue()).iterator(); i.hasNext();) {
>+				List resources = (List)msg.getNewValue();
>+				if (resources == null)
>+					break;
>+				
>+				for (Iterator i = resources.iterator(); i.hasNext();) {
> 					denormalize((Resource)msg.getNewValue(), getResourceSet().getURIConverter());
> 				}
> 				break;
>@@ -436,7 +440,11 @@
> 				normalize((Resource)msg.getOldValue(), getResourceSet().getURIConverter());
> 				break;
> 			case Notification.REMOVE_MANY:
>-				for (Iterator i = ((List)msg.getNewValue()).iterator(); i.hasNext();) {
>+				resources = (List)msg.getNewValue();
>+				if (resources == null)
>+					break;
>+				
>+				for (Iterator i = resources.iterator(); i.hasNext();) {
> 					normalize((Resource)msg.getNewValue(), getResourceSet().getURIConverter());
> 				}
> 				break;

Actions: View | Diff

Attachments on bug 137281: 39032