Merge pull request #811 from keikeicheung/main

add logs around vuu sorting issue

Author: keikeicheung

vuu/src/main/scala/org/finos/vuu/viewport/ViewPortCallable.scala

@@ -1,25 +1,40 @@
 package org.finos.vuu.viewport
 
+import com.typesafe.scalalogging.StrictLogging
+
 import java.util.concurrent.{Callable, FutureTask}
 
-object ViewPortCallable {
+trait ViewPortCallableMBean {
+  def apply(r: FutureTask[ViewPort], viewPortContainer: ViewPortContainer): Callable[ViewPort]
+}
+object ViewPortCallable extends StrictLogging with ViewPortCallableMBean {
 
   def apply(r: FutureTask[ViewPort], viewPortContainer: ViewPortContainer): Callable[ViewPort] = {
     () => {
-      val viewport = r.get()
-      viewPortContainer.refreshOneViewPort(viewport)
-      viewport
+      try {
+        val viewport = r.get()
+        viewPortContainer.refreshOneViewPort(viewport)
+        viewport
+      } catch {
+        case e: Exception => logger.error(e.getMessage + " - " + e.getStackTrace)
+          null
+      }
     }
   }
 }
 
-object ViewPortTreeCallable {
+object ViewPortTreeCallable extends StrictLogging with ViewPortCallableMBean {
 
   def apply(r: FutureTask[ViewPort], viewPortContainer: ViewPortContainer): Callable[ViewPort] = {
     () => {
-      val viewport = r.get()
-      viewPortContainer.refreshOneTreeViewPort(viewport)
-      viewport
+      try {
+        val viewport = r.get()
+        viewPortContainer.refreshOneTreeViewPort(viewport)
+        viewport
+      } catch {
+        case e: Exception => logger.error(e.getMessage + " - " + e.getStackTrace)
+          null
+      }
     }
   }
 }

vuu/src/main/scala/org/finos/vuu/viewport/ViewPortWorkItem.scala

@@ -1,35 +1,52 @@
 package org.finos.vuu.viewport
 
+import com.typesafe.scalalogging.StrictLogging
 import org.finos.toolbox.thread.WorkItem
 
-object ViewPortWorkItem{
+object ViewPortWorkItem extends StrictLogging {
   def apply(viewPort: ViewPort, container: ViewPortContainer): WorkItem[ViewPort] = {
-    new WorkItem[ViewPort] {
-      override def doWork(): ViewPort = {
-        container.refreshOneViewPort(viewPort)
-        viewPort
-      }
-      override def toString: String = "Runner:[" + viewPort + "]"
-      override def hashCode(): Int = viewPort.hashCode()
-      override def equals(obj: Any): Boolean = {
-        this.hashCode() == obj.hashCode()
+    try {
+      new WorkItem[ViewPort] {
+        override def doWork(): ViewPort = {
+          container.refreshOneViewPort(viewPort)
+          viewPort
+        }
+
+        override def toString: String = "Runner:[" + viewPort + "]"
+
+        override def hashCode(): Int = viewPort.hashCode()
+
+        override def equals(obj: Any): Boolean = {
+          this.hashCode() == obj.hashCode()
+        }
       }
+    } catch {
+      case e: Exception => logger.error(e.getMessage + " " + e.getStackTrace)
+        null
     }
   }
 }
 
-object ViewPortTreeWorkItem{
+object ViewPortTreeWorkItem extends StrictLogging {
   def apply(viewPort: ViewPort, container: ViewPortContainer): WorkItem[ViewPort] = {
-    new WorkItem[ViewPort] {
-      override def doWork(): ViewPort = {
-        container.refreshOneTreeViewPort(viewPort)
-        viewPort
-      }
-      override def toString: String = "TreeRunner:[" + viewPort + "]"
-      override def hashCode(): Int = viewPort.hashCode()
-      override def equals(obj: Any): Boolean = {
-        this.hashCode() == obj.hashCode()
+    try {
+      new WorkItem[ViewPort] {
+        override def doWork(): ViewPort = {
+          container.refreshOneTreeViewPort(viewPort)
+          viewPort
+        }
+
+        override def toString: String = "TreeRunner:[" + viewPort + "]"
+
+        override def hashCode(): Int = viewPort.hashCode()
+
+        override def equals(obj: Any): Boolean = {
+          this.hashCode() == obj.hashCode()
+        }
       }
+    } catch {
+      case e: Exception => logger.error(e.getMessage + " " + e.getStackTrace)
+        null
     }
   }
 }