Author: vrubezhny Date: 2008-04-21 13:23:39 -0400 (Mon, 21 Apr 2008) New Revision: 7659 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/TypeInfoCollector.java Log: http://jira.jboss.com/jira/browse/JBIDE-2090 ConcurrentModificationException occurs during the Seam validation The rev. 7651 results in a deadlock, typeInfo is not stored anymore Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/TypeInfoCollector.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/TypeInfoCollector.java 2008-04-21 16:43:40 UTC (rev 7658) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/TypeInfoCollector.java 2008-04-21 17:23:39 UTC (rev 7659) @@ -227,7 +227,7 @@ private boolean isDataModel; private Type fType; - TypeInfoCollector typeInfo; +// TypeInfoCollector typeInfo; protected MemberInfo ( IType sourceType, @@ -328,16 +328,13 @@ } public TypeInfoCollector getTypeCollector() { + // The rev. 7651 results in a deadlock, typeInfo is not stored anymore // The rev. 7623 results in a deadlock, so, it's rolled back // >>> Fix for JBIDE-2090 - if(typeInfo != null) return typeInfo; - TypeInfoCollector tic = new TypeInfoCollector(this); tic.collectInfo(); - typeInfo = tic; - + return tic; // <<< Fix for JBIDE-2090 - return typeInfo; } abstract public IJavaElement getJavaElement(); @@ -714,6 +711,7 @@ } if (fType == null) { + System.out.println(Thread.currentThread().getId() + ":" + Thread.currentThread() + "<<< TypeInfoCollector<Init>"); return; } try {