Progress on: 156271: Error on "Add Existing Task" if not authenticated

https://bugs.eclipse.org/bugs/show_bug.cgi?id=156271

2 files changed, 14 insertions, 9 deletions

diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
index 7c589748e..6ab5b82ef 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
@@ -148,9 +148,8 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 
 			return task;
 		} catch (Exception e) {
-			MylarStatusHandler.log(e, "Error creating task from key " + id);
+			throw new CoreException(TracCorePlugin.toStatus(e));
 		}
-		return null;
 	}
 
 	public synchronized TracClientManager getClientManager() {
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
index a22812178..f78bce72d 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
@@ -115,17 +115,17 @@ public class TracRepositoryConnectorTest extends TestCase {
 		assertEquals(null, connector.getRepositoryUrlFromTaskUrl("http://host/repo/ticket-2342"));
 	}
 
-	public void testCreateTaskFromExistingKeyXmlRpc_010() throws CoreException {
+	public void testCreateTaskFromExistingKeyXmlRpc010() throws CoreException {
 		init(Constants.TEST_TRAC_010_URL, Version.XML_RPC);
 		createTaskFromExistingKey();
 	}
 
-	public void testCreateTaskFromExistingKeyTrac09_010() throws CoreException {
+	public void testCreateTaskFromExistingKeyTracWeb010() throws CoreException {
 		init(Constants.TEST_TRAC_010_URL, Version.TRAC_0_9);
 		createTaskFromExistingKey();
 	}
 
-	public void testCreateTaskFromExistingKeyTrac09_096() throws CoreException {
+	public void testCreateTaskFromExistingKeyTracWeb096() throws CoreException {
 		init(Constants.TEST_TRAC_096_URL, Version.TRAC_0_9);
 		createTaskFromExistingKey();
 	}
@@ -138,11 +138,17 @@ public class TracRepositoryConnectorTest extends TestCase {
 		assertTrue(task.getDescription().contains("summary1"));
 		assertEquals(repository.getUrl() + ITracClient.TICKET_URL + id, task.getUrl());
 
-		task = connector.createTaskFromExistingKey(repository, "does not exist", null);
-		assertNull(task);
+		try {
+			task = connector.createTaskFromExistingKey(repository, "does not exist", null);
+			fail("Expected CoreException");
+		} catch (CoreException e) {
+		}
 
-		task = connector.createTaskFromExistingKey(repository, Integer.MAX_VALUE + "", null);
-		assertNull(task);
+		try {
+			task = connector.createTaskFromExistingKey(repository, Integer.MAX_VALUE + "", null);
+			fail("Expected CoreException");
+		} catch (CoreException e) {
+		}
 	}
 
 	public void testClientManagerChangeTaskRepositorySettings() throws MalformedURLException {