- make sure to cancel the thread after presentation conversion

2014-09-15 09:05:03 -07:00 · 2014-09-15 09:05:03 -07:00 · 50352c0204
commit 50352c0204
parent e313379355
1 changed files with 9 additions and 4 deletions
--- a/bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
+++ b/bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
@ -78,10 +78,15 @@ class PresentationService {
  }
 	
 	def processUploadedPresentation = {uploadedPres ->	
-		// Run conversion on another thread.
-		new Timer(uploadedPres.getName(), false).runAfter(1000) 
-		{
-			documentConversionService.processDocument(uploadedPres)
+		// Run conversion on another thread.
+		Timer t = new Timer(uploadedPres.getName(), false)
+		
+		t.runAfter(1000) {
+			try {
+				documentConversionService.processDocument(uploadedPres)
+			} finally {
+		    t.cancel()
+			} 
 		}
 	}