Bug 65807 NPE comparing with released

1 files changed, 9 insertions, 5 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
index e303a225d..101bd9e68 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
@@ -127,11 +127,15 @@ public class CompareParticipant extends CVSParticipant implements IPropertyChang
 				} catch (TeamException e) {
 					continue;
 				}
-				IResource[] roots = p.getResources();
-				Arrays.sort(resources, Utils.resourceComparator);
-				Arrays.sort(roots, Utils.resourceComparator);
-				if (Arrays.equals(resources, roots) && p.getTag().equals(tag)) {
-					return p;
+				CVSTag existingTag = p.getTag();
+				// The tag can be null if the compare participant has a different tag for each root
+				if (existingTag != null) {
+					IResource[] roots = p.getResources();
+					Arrays.sort(resources, Utils.resourceComparator);
+					Arrays.sort(roots, Utils.resourceComparator);
+					if (Arrays.equals(resources, roots) && existingTag.equals(tag)) {
+						return p;
+					}
 				}
 			}
 		}