Commit e7ab09ab authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ fixes for deadlocks due to incomplete transition from resources to uris

parent abe5c6a8

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/common/PreAnalyzer.java

+3 −1
Original line number Diff line number Diff line
@@ -85,8 +85,10 @@ public class PreAnalyzer implements Callable<Boolean> { 
		ImportData data = new ImportData(def.getName(), def, module);

		

		if (module != null) {

			synchronized (TTCN3GlobalScopeProvider.EXPORTED_OBJECTS) {

				data.getExportedObjects().addAll(TTCN3GlobalScopeProvider.EXPORTED_OBJECTS.get(module.eResource().getURI().toString()));

			}

		}

		

		return data;

	}

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/scoping/TTCN3GlobalScopeProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ public class TTCN3GlobalScopeProvider extends AbstractGlobalScopeProvider { 


	protected IScope getImportedScope(final Resource resource, final EReference reference) {



		if (TTCN3StatisticsProvider.getInstance().isPreAnalyzingCompleted() && STATIC_SCOPE.containsKey(resource)) {

			return STATIC_SCOPE.get(resource);

		if (TTCN3StatisticsProvider.getInstance().isPreAnalyzingCompleted() && STATIC_SCOPE.containsKey(resource.getURI().toString())) {

			return STATIC_SCOPE.get(resource.getURI().toString());

		} else if (TTCN3StatisticsProvider.getInstance().isPreAnalyzingCompleted()) {

			IScope scope = IScope.NULLSCOPE;

			List<IEObjectDescription> objects = Lists.newArrayList();