Merge pull request #1348 from myronkscott/remove_jmx

[5.10] remove JMX detection, not needed

Author: Clifford W. Johnson

common/src/main/java/com/tc/lang/ThrowableHandlerImpl.java

@@ -113,22 +113,6 @@ public void addCallbackOnExitExceptionHandler(Class<?> c, CallbackOnExitHandler
   public void handleThrowable(Thread thread, Throwable t) {
     handlePossibleOOME(t);
 
-    if (isThreadGroupDestroyed(thread, t)) {
-      logger.warn("Ignoring an attempt to start a JMX thread during shutdown.", t);
-      return;
-    }
-
-    if (isJMXTerminatedException(t)) {
-      logger.warn("Ignoring a Thread Service termination error from JMX.", t);
-      return;
-    }
-
-    if (isNotificationFetcherThread(thread)) {
-      // DEV-5006 -- Do not exit L2.
-      logger.warn("Got Exception in JMX Notification forwarding", t);
-      return;
-    }
-
     final CallbackOnExitState throwableState = new CallbackOnExitState(t);
     scheduleExit(throwableState);
 
@@ -151,19 +135,6 @@ public void handleThrowable(Thread thread, Throwable t) {
     exit(throwableState);
   }
 
-  private static boolean isThreadGroupDestroyed(Thread thread, Throwable t) {
-    // see EHCTERR-32
-    if (t instanceof IllegalThreadStateException) {
-      StackTraceElement[] stack = t.getStackTrace();
-      StackTraceElement bottom = stack[stack.length - 1];
-      if (stack[0].getClassName().equals("java.lang.ThreadGroup") && stack[0].getMethodName().equals("addUnstarted")
-          && bottom.getClassName().equals("javax.management.remote.generic.GenericConnectorServer$Receiver")
-          && bottom.getMethodName().equals("run")) { return true; }
-    }
-
-    return false;
-  }
-
   /**
    * Makes sure we don't allocate any heap objects on OOME.
    * {@code -XX:+HeapDumpOnOutOfMemoryError} should take care of debug information.
@@ -241,26 +212,4 @@ protected synchronized void exit(int status) {
     ThreadUtil.reallySleep(2000);
     System.exit(status);
   }
-
-  private static boolean isNotificationFetcherThread(Thread thread) {
-    // UGLY Way to Ignore exception in JMX Notification Forwarder Thread.
-    try {
-      Field runnableField = thread.getClass().getDeclaredField("target");
-      runnableField.setAccessible(true);
-      Object runnable = runnableField.get(thread);
-      if (runnable != null && runnable.getClass().getSimpleName().equals("NotifFetcher")) {
-        return true;
-      } else {
-        return false;
-      }
-    } catch (Throwable e) {
-      return false;
-    }
-
-  }
-
-  private static boolean isJMXTerminatedException(Throwable throwable) {
-    return throwable instanceof IllegalStateException &&
-           throwable.getMessage().contains("The Thread Service has been terminated.");
-  }
 }

common/src/test/java/com/tc/lang/ThrowableHandlerTest.java

@@ -70,62 +70,6 @@ protected synchronized void exit(int status) {
     assertEquals(-1, exitCode.get());
   }
 
-  public void testHandleJMXThreadServiceTermination() throws Exception {
-    final AtomicBoolean exited = new AtomicBoolean(false);
-    ThrowableHandler throwableHandler = new ThrowableHandlerImpl(LoggerFactory.getLogger(getClass())) {
-      @Override
-      protected synchronized void exit(int status) {
-        exited.set(true);
-      }
-    };
-    throwableHandler.handleThrowable(Thread.currentThread(),
-                                     new IllegalStateException("The Thread Service has been terminated."));
-    assertFalse(exited.get());
-  }
-
-  public void testIsThreadGroupDestroyed() throws Exception {
-    final AtomicBoolean exited = new AtomicBoolean(false);
-    ThrowableHandler throwableHandler = new ThrowableHandlerImpl(LoggerFactory.getLogger(getClass())) {
-      @Override
-      protected synchronized void exit(int status) {
-        exited.set(true);
-      }
-    };
-
-    Runnable r = new Runnable() {
-      @Override
-      public void run() {
-        //
-
-      }
-    };
-
-    ThreadGroup threadGroup = new ThreadGroup("blah");
-    Thread thread = new Thread(threadGroup, r);
-    thread.start();
-    thread.join();
-    threadGroup.destroy();
-
-    Throwable t = null;
-    try {
-      Thread tempThread = new Thread(threadGroup, r);      
-      fail();
-      assertFalse(tempThread.isAlive()); // stupid workaround to clear warning about unused allocated object
-    } catch (Throwable th) {
-      t = th;
-    }
-
-    StackTraceElement[] stack = t.getStackTrace();
-    stack[stack.length - 1] = new StackTraceElement("javax.management.remote.generic.GenericConnectorServer$Receiver",
-                                                    "run", "Foo.java", 12);
-    t.setStackTrace(stack);
-
-    throwableHandler.handleThrowable(thread, t);
-    if (!new VmVersion(System.getProperties()).isIBM()) {
-      assumeFalse(exited.get());  // this fails for IBM JDK
-    }
-  }
-
   private class TestCallbackOnExitHandler implements CallbackOnExitHandler {
 
     @Override