You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2011/08/30 01:21:46 UTC

svn commit: r1163049 - /maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java

Author: bimargulies
Date: Mon Aug 29 23:21:46 2011
New Revision: 1163049

URL: http://svn.apache.org/viewvc?rev=1163049&view=rev
Log:
Fix deadlock.

Modified:
    maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java

Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java?rev=1163049&r1=1163048&r2=1163049&view=diff
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java (original)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/editors/AbstractMultiPageEditorPart.java Mon Aug 29 23:21:46 2011
@@ -509,13 +509,25 @@ public abstract class AbstractMultiPageE
         /** {@inheritDoc} */
         public void documentChanged( DocumentEvent event )
         {
-            DoxiaWrapper.convert( document.get(), getDoxiaFile(), getFormat() );
+            // avoid deadlock with ourselves by spitting this out to run asynchronously.
+            Display.getCurrent().asyncExec( new Runnable () {
+
+                public void run()
+                {
+                    DoxiaWrapper.convert( document.get(), getDoxiaFile(), getFormat() );
+                } 
+                
+            });
+
         }
 
         /** {@inheritDoc} */
         public void documentAboutToBeChanged( DocumentEvent event )
         {
-            DoxiaWrapper.convert( document.get(), getDoxiaFile(), getFormat() );
+            // I (bimargulies) don't believe that we need this and also the above. 
+            // 
+            //DoxiaWrapper.convert( document.get(), getDoxiaFile(), getFormat() );
+            // 
         }
     }
 }