1 files changed, 16 insertions, 1 deletions
diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
index 4a4733c674ed..790a52d46fb1 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
+++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
@@ -312,7 +312,22 @@ public class AsyncJob extends    WeakBase implements XServiceInfo, XAsyncJob
         // Because we need a parent anytime.
         // And showing e.g. a java dialog can make some trouble
         // inside office ... but we have no chance here.
-        javax.swing.JOptionPane.showMessageDialog(null, sMessage, sTitle, javax.swing.JOptionPane.INFORMATION_MESSAGE);
+    final java.lang.String sFinalTitle = sTitle;
+    final java.lang.String sFinalMessage = sMessage;
+
+    // On Mac OS X, AWT/Swing must not be accessed from the AppKit thread, so call
+    // SwingUtilities.invokeLater always on a fresh thread to avoid that problem
+    // (also, the current thread must not wait for that fresh thread to terminate,
+    // as that would cause a deadlock if this thread is the AppKit thread):
+    final Runnable doRun = new Runnable() {
+        public void run() {
+            javax.swing.JOptionPane.showMessageDialog(null, sFinalMessage, sFinalTitle, javax.swing.JOptionPane.INFORMATION_MESSAGE);
+        }
+        };
+
+     new Thread( doRun ) {
+         public void run() { javax.swing.SwingUtilities.invokeLater(doRun); }
+     }.start();
     }
 
     //___________________________________________