209907 Deadlock, slow activation associated with org.eclipse.wst.server.core
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java index 3b080e3..7a42139 100644 --- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java +++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
@@ -245,10 +245,12 @@ return name.substring(index + 1); } - public synchronized static ResourceManager getInstance() { - if (instance == null) - new ResourceManager(); - + public static ResourceManager getInstance() { + synchronized (ServerCore.class) { + if (instance == null) + new ResourceManager(); + } + return instance; }