204833 deadlock caused by WebServiceViewerSynchronization
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html index 362de9d..838e9a5 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html +++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
@@ -18,4 +18,5 @@ <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204287'>204287</a>. optimization for J2EEComponentClasspathUpdater.queueUpdate</p> <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204315'>204315</a>. Web Lib projects being added to the EAR</p> <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=205602'>205602</a>. EAR import not importing manifest file</p> - +<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=206463'>206463</a>. Threading issues with WebServicesNode Job</p> +<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204833'>206463</a>. deadlock caused by WebServiceViewerSynchronization</p>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties index 9b7701c..7046bd5 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties +++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
@@ -35,6 +35,8 @@ <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204287'>204287</a>. optimization for J2EEComponentClasspathUpdater.queueUpdate</p>\n\ <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204315'>204315</a>. Web Lib projects being added to the EAR</p>\n\ <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=205602'>205602</a>. EAR import not importing manifest file</p>\n\ +<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=206463'>206463</a>. Threading issues with WebServicesNode Job</p>\n\ +<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204833'>206463</a>. deadlock caused by WebServiceViewerSynchronization</p>\n\ \n\ # "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml index 8be7402..0b4fe02 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml +++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
@@ -32,16 +32,25 @@ download-size="0" install-size="0" version="0.0.0" - unpack="false"/> - - + unpack="false"/> <plugin id="org.eclipse.jst.j2ee.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - + <plugin + id="org.eclipse.jst.j2ee.webservice" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + <plugin + id="org.eclipse.jst.j2ee.webservice.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> </feature>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java index 3da5185..9f2cc14 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java
@@ -315,6 +315,8 @@ public RemoveWebServicesNodeUIJob() { super(WebServiceUIResourceHandler.WS_NAV_JOB4); + // [204833] + setRule(ResourcesPlugin.getWorkspace().getRoot()); } public IStatus runInUIThread(IProgressMonitor monitor) {