Attachment 191693 Details for Bug 308741 – Patch for 3.6.2+

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for 3.6.2+

clipboard.txt (text/plain), 1.93 KB, created by Curtis Windatt

on 2011-03-22 11:57:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2011-03-22 11:57:10 EDT

Size: 1.93 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java,v
>retrieving revision 1.71
>diff -u -r1.71 BundleErrorReporter.java
>--- src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java	10 May 2010 21:05:35 -0000	1.71
>+++ src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java	22 Mar 2011 15:56:35 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -477,6 +477,11 @@
> 		}
> 
> 		BundleSpecification[] specs = desc.getRequiredBundles();
>+		if (specs.length != required.length) {
>+			// If the bundle description has stale data in it, don't compare it to the header data, see bug 308741
>+			specs = null;
>+		}
>+
> 		for (int i = 0; i < required.length; i++) {
> 			checkCanceled(monitor);
> 
>@@ -492,7 +497,8 @@
> 			boolean optional = isOptional(required[i]);
> 			int severity = getRequireBundleSeverity(required[i], optional);
> 
>-			if (specs[i].getSupplier() == null) {
>+			// It is possible for the bundle description to not match the headers
>+			if (specs != null && specs[i].getSupplier() == null) {
> 				if (desc.getContainingState().getBundle(specs[i].getName(), null) == null) {
> 					IMarker marker = report(NLS.bind(PDECoreMessages.BundleErrorReporter_NotExistPDE, bundleID), getPackageLine(header, required[i]), severity, PDEMarkerFactory.M_REQ_BUNDLE_NOT_AVAILABLE, PDEMarkerFactory.CAT_FATAL);
> 					try {

Actions: View | Diff

Attachments on bug 308741: 164736 | 191693