/*
 * Copyright 2000-2014 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.intellij.openapi.application;

import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

/**
 * Provides access to the <code>Application</code>.
 */
public class ApplicationManager {
  protected static Application ourApplication = null;

  /**
   * Gets Application.
   *
   * @return <code>Application</code>
   */
  @Nullable
  public static Application getApplication() {
    return ourApplication;
  }

  private static void setApplication(@Nonnull Application instance) {
    ourApplication = instance;
    CachedSingletonsRegistry.cleanupCachedFields();
  }

  public static void setApplication(@Nonnull Application instance, @Nonnull Disposable parent) {
    final Application old = ourApplication;
    Disposer.register(parent, () -> {
      if (old != null) { // to prevent NPEs in threads still running
        setApplication(old);
      }
    });
    setApplication(instance);
  }
}

@@ -1138,38 +1138,39 @@
 etApplication(@N
-onn
 ull
+able
  Application ins
@@ -1371,197 +1371,60 @@
     
-final Application old = ourApplication;%0A    Disposer.register(parent, () -%3E %7B%0A      if (old != null) %7B // to prevent NPEs in threads still running%0A        setApplication(old);%0A      %7D%0A    %7D
+Disposer.register(parent, () -%3E setApplication(null)
 );%0A 

reset app to null