1 files changed, 7 insertions, 9 deletions
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java
index c9246a9c5..a33495b56 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java
@@ -176,18 +176,16 @@ public abstract class AbstractTracClient implements ITracClient {
 
 	public TracTicketField getTicketFieldByName(String name) {
 		if (data.ticketFields != null) {
-			// lazily fill fieldByName map
-			if (data.ticketFieldByName == null) {
-				synchronized (data) {
-					if (data.ticketFieldByName == null) {
-						data.ticketFieldByName = new HashMap<String, TracTicketField>();
-						for (TracTicketField field : data.ticketFields) {
-							data.ticketFieldByName.put(field.getName(), field);
-						}
+			synchronized (this) {
+				// lazily fill fieldByName map
+				if (data.ticketFieldByName == null) {
+					data.ticketFieldByName = new HashMap<String, TracTicketField>();
+					for (TracTicketField field : data.ticketFields) {
+						data.ticketFieldByName.put(field.getName(), field);
 					}
 				}
+				return data.ticketFieldByName.get(name);
 			}
-			return data.ticketFieldByName.get(name);
 		}
 		return null;
 	}