### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core.tests.model
Index: src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java,v
retrieving revision 1.21
diff -u -r1.21 CompletionTestsRequestor2.java
--- src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java	6 Mar 2007 04:43:20 -0000	1.21
+++ src/org/eclipse/jdt/core/tests/model/CompletionTestsRequestor2.java	16 May 2007 16:37:59 -0000
@@ -173,16 +173,22 @@
 		if(this.proposalsPtr < 0) return "";
 		Arrays.sort(this.proposals, new Comparator() {
 			public int compare(Object o1, Object o2) {
-				if (o1 instanceof CompletionProposal && o2 instanceof CompletionProposal) {
-					CompletionProposal p1 = (CompletionProposal) o1;
-					CompletionProposal p2 = (CompletionProposal) o2;
-					int relDif = p2.getRelevance() - p1.getRelevance();
-					if(relDif != 0)  return relDif;
-					String name1 = getElementName(p1);
-					String name2 = getElementName(p2);
-					return name1.compareTo(name2);
+				if (o1 == null) {
+					if (o2 == null) {
+						return 0;
+					} else {
+						return 1;
+					}
+				} else if (o2 == null) {
+					return -1;
 				}
-				return -1;
+				CompletionProposal p1 = (CompletionProposal) o1;
+				CompletionProposal p2 = (CompletionProposal) o2;
+				int relDif = p2.getRelevance() - p1.getRelevance();
+				if(relDif != 0) return relDif;
+				String name1 = getElementName(p1);
+				String name2 = getElementName(p2);
+				return name1.compareTo(name2);
 			}
 		});
 		return getResultsWithoutSorting();