| Index: pkg/analysis_server/lib/src/analysis_server.dart | 
| diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart | 
| index 4a2734c3e575b8983c42b25dbb85f7b0b7305c7e..25d425c6eaca73ed5d9895c3d959c9a163966146 100644 | 
| --- a/pkg/analysis_server/lib/src/analysis_server.dart | 
| +++ b/pkg/analysis_server/lib/src/analysis_server.dart | 
| @@ -728,7 +728,7 @@ class AnalysisServer { | 
| return units; | 
| } | 
| // add a unit for each unit/library combination | 
| -    runWithWorkingCacheSize(context, () { | 
| +    runWithActiveContext(context, () { | 
| Source unitSource = contextSource.source; | 
| List<Source> librarySources = context.getLibrariesContaining(unitSource); | 
| for (Source librarySource in librarySources) { | 
| @@ -1468,7 +1468,7 @@ class AnalysisServer { | 
| return null; | 
| } | 
| // if library has been already resolved, resolve unit | 
| -    return runWithWorkingCacheSize(context, () { | 
| +    return runWithActiveContext(context, () { | 
| return context.resolveCompilationUnit2(source, librarySource); | 
| }); | 
| } | 
|  |