Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcrogers2010-11-30 17:48:04 -0500
committercrogers2010-11-30 17:48:04 -0500
commit57280eeca9fa9f8477242a1646abd79ea8b3cd88 (patch)
tree613013df490f515315b9f6b423b13b7a7e8ac511
parent0b98a73b351c4f094e86846b18c551f41d448c00 (diff)
downloadwebtools.jsf-57280eeca9fa9f8477242a1646abd79ea8b3cd88.tar.gz
webtools.jsf-57280eeca9fa9f8477242a1646abd79ea8b3cd88.tar.xz
webtools.jsf-57280eeca9fa9f8477242a1646abd79ea8b3cd88.zip
Bug 330976 - Potential for deadlock in JSFAppConfigManager init. Additional change required to avoid locking on JSFAppConfigManagerFactory.class monitor while acquiring rule.
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/internal/JSFAppConfigManagerFactory.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/internal/JSFAppConfigManagerFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/internal/JSFAppConfigManagerFactory.java
index 78632e2b5..3119cf2a3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/internal/JSFAppConfigManagerFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/internal/JSFAppConfigManagerFactory.java
@@ -36,7 +36,7 @@ public class JSFAppConfigManagerFactory
* @param project
* @return IJSFAppConfigManager
*/
- public synchronized static IJSFAppConfigManager getJSFAppConfigManagerInstance(final IProject project) {
+ public static IJSFAppConfigManager getJSFAppConfigManagerInstance(final IProject project) {
try {
return getJSFAppConfigManagerFactoryInstance(project).getInstance(project);
} catch (ManagedObjectException e) {
@@ -45,7 +45,7 @@ public class JSFAppConfigManagerFactory
return null;
}
- private static JSFAppConfigManagerFactory getJSFAppConfigManagerFactoryInstance(final IProject project) {
+ private synchronized static JSFAppConfigManagerFactory getJSFAppConfigManagerFactoryInstance(final IProject project) {
if (INSTANCE == null) {
INSTANCE = new JSFAppConfigManagerFactory(project);
}

Back to the top