From ac5e3c3c69ab46cfb0ce9df0119e7d36f20e8b2b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 25 Sep 2014 12:47:00 +0200
Subject: [PATCH] CR-IC-6374

---
 .../com/intellij/ide/actions/ExportSettingsAction.java |  2 +-
 .../openapi/components/impl/ServiceManagerImpl.java    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java
index eeee793cccc2..9417feb0c3a2 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java
@@ -73,7 +73,7 @@ public class ExportSettingsAction extends AnAction implements DumbAware {
       return;
     }
 
-    Set<File> exportFiles = new THashSet<File>();
+    Set<File> exportFiles = new THashSet<File>(FileUtil.FILE_HASHING_STRATEGY);
     for (final ExportableComponent markedComponent : markedComponents) {
       ContainerUtil.addAll(exportFiles, markedComponent.getExportFiles());
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java
index 68e536284274..9e448de240fc 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.components.BaseComponent;
 import com.intellij.openapi.components.ComponentManager;
 import com.intellij.openapi.components.ServiceDescriptor;
 import com.intellij.openapi.components.ex.ComponentManagerEx;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
@@ -38,6 +39,8 @@ import java.util.Collection;
 import java.util.List;
 
 public class ServiceManagerImpl implements BaseComponent {
+  private static final Logger LOG = Logger.getInstance(ServiceManagerImpl.class);
+
   private static final ExtensionPointName<ServiceDescriptor> APP_SERVICES = new ExtensionPointName<ServiceDescriptor>("com.intellij.applicationService");
   private static final ExtensionPointName<ServiceDescriptor> PROJECT_SERVICES = new ExtensionPointName<ServiceDescriptor>("com.intellij.projectService");
   private ExtensionPointName<ServiceDescriptor> myExtensionPointName;
@@ -103,10 +106,13 @@ public class ServiceManagerImpl implements BaseComponent {
         }
         catch (RuntimeException e) {
           // ignore ClassNotFoundException - invalid entry (GithubSslSupport, for example)
-          if (!(e.getCause() instanceof ClassNotFoundException)) {
+          if (e.getCause() instanceof ClassNotFoundException) {
+            LOG.warn(e);
+            continue;
+          }
+          else {
             throw e;
           }
-          continue;
         }
 
         if (!processor.process(aClass, adapter.myPluginDescriptor)) {