Changeset 830

Timestamp:

02/04/14 23:11:35 (10 years ago)

Author:

davidb

Message:

Shutdown handler added to deal with the situation where an Action (a Runnable/Thread) throws an exception.

File:

• trunk/src/org/expeditee/actions/Actions.java (modified) (2 diffs)

trunk/src/org/expeditee/actions/Actions.java

@@ -611 +611 @@
                         _Agent = agent;
 
-                        Thread t = new Thread(_Agent);
+                        Thread.UncaughtExceptionHandler h = new Thread.UncaughtExceptionHandler() {
+                            public void uncaughtException(Thread th, Throwable ex) {
+                         
+                                MessageBay.errorMessage("Error occurred in Action: " + th.getName());
+                                ex.printStackTrace();
+
+                                stopAgent();
+                                _Agent = null;
+                            }
+                        };
+                        
+                        Thread t = new Thread(_Agent,nameWithCorrectCase);
+                
                         t.setPriority(Thread.MIN_PRIORITY);
-
+                        t.setUncaughtExceptionHandler(h);
+                        
                         if (FreeItems.textOnlyAttachedToCursor()) {
                                 itemParam = FreeItems.getItemAttachedToCursor();
@@ -635 +648 @@
                                 // background
                                 t.run();
-                                String result = _Agent.toString();
-                                // Attach the result to the cursor
-                                if (FreeItems.textOnlyAttachedToCursor()) {
+                                if (_Agent != null) {
+                                    String result = _Agent.toString();
+                                    // Attach the result to the cursor
+                                    if (FreeItems.textOnlyAttachedToCursor()) {
                                         Item resultItem = FreeItems.getItemAttachedToCursor();
                                         resultItem.setText(result);
+                                    }
+                                    // if there is a completion frame, then display it to the user
                                 }
-                                // if there is a completion frame, then display it to the user
                         } else {
                                 t.start();
-                                if (_Agent.hasResultFrame()) {
+                                if (_Agent != null && _Agent.hasResultFrame()) {
                                         // TODO We want to be able to navigate through the frames as
                                         // the results are loading