jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java

*** 50,60 ****
  import javax.management.remote.TargetedNotification;
  
  import com.sun.jmx.remote.util.ClassLogger;
  import com.sun.jmx.remote.util.EnvHelp;
  import java.lang.reflect.UndeclaredThrowableException;
- import java.rmi.UnmarshalException;
  import java.util.concurrent.RejectedExecutionException;
  
  
  public abstract class ClientNotifForwarder {
  
--- 50,59 ----
*** 631,641 ****
                      logger.trace("NotifFetcher-run",
                                   "Got notifications from the server: "+nr);
                  }
  
                  return nr;
!             } catch (ClassNotFoundException | NotSerializableException | UnmarshalException e) {
                  logger.trace("NotifFetcher.fetchNotifs", e);
                  return fetchOneNotif();
              } catch (IOException ioe) {
                  if (!shouldStop()) {
                      logger.error("NotifFetcher-run",
--- 630,640 ----
                      logger.trace("NotifFetcher-run",
                                   "Got notifications from the server: "+nr);
                  }
  
                  return nr;
!             } catch (ClassNotFoundException | NotSerializableException e) {
                  logger.trace("NotifFetcher.fetchNotifs", e);
                  return fetchOneNotif();
              } catch (IOException ioe) {
                  if (!shouldStop()) {
                      logger.error("NotifFetcher-run",
*** 703,713 ****
                      firstEarliest = nr.getEarliestSequenceNumber();
  
                  try {
                      // 1 notif to skip possible missing class
                      result = cnf.fetchNotifs(startSequenceNumber, 1, 0L);
!                 } catch (ClassNotFoundException | NotSerializableException | UnmarshalException e) {
                      logger.warning("NotifFetcher.fetchOneNotif",
                                     "Failed to deserialize a notification: "+e.toString());
                      if (logger.traceOn()) {
                          logger.trace("NotifFetcher.fetchOneNotif",
                                       "Failed to deserialize a notification.", e);
--- 702,712 ----
                      firstEarliest = nr.getEarliestSequenceNumber();
  
                  try {
                      // 1 notif to skip possible missing class
                      result = cnf.fetchNotifs(startSequenceNumber, 1, 0L);
!                 } catch (ClassNotFoundException | NotSerializableException e) {
                      logger.warning("NotifFetcher.fetchOneNotif",
                                     "Failed to deserialize a notification: "+e.toString());
                      if (logger.traceOn()) {
                          logger.trace("NotifFetcher.fetchOneNotif",
                                       "Failed to deserialize a notification.", e);