test/jdk/javax/management/remote/mandatory/loading/MissingClassTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 181,192 ****
                                 "unknown to client should fail, returned: " +
                                 result);
              ok = false;
          } catch (IOException e) {
              Throwable cause = e.getCause();
-             if (isInstance(cause, "org.omg.CORBA.MARSHAL"))  // see CR 4935098
-                 cause = cause.getCause();
              if (cause instanceof ClassNotFoundException) {
                  System.out.println("Success: got an IOException wrapping " +
                                     "a ClassNotFoundException");
              } else {
                  System.out.println("TEST FAILS: Caught IOException (" + e +
--- 181,190 ----
*** 205,216 ****
              mbsc.invoke(on, "throwClientUnknown", NO_OBJECTS, NO_STRINGS);
              System.out.println("TEST FAILS: did not get exception");
              ok = false;
          } catch (IOException e) {
              Throwable wrapped = e.getCause();
-             if (isInstance(wrapped, "org.omg.CORBA.MARSHAL"))  // see CR 4935098
-                 wrapped = wrapped.getCause();
              if (wrapped instanceof ClassNotFoundException) {
                  System.out.println("Success: got an IOException wrapping " +
                                     "a ClassNotFoundException: " +
                                     wrapped);
              } else {
--- 203,212 ----
*** 258,269 ****
                                     "class unknown to server should fail " +
                                     "but did not");
                  ok = false;
              } catch (IOException e) {
                  Throwable cause = e.getCause();
-                 if (isInstance(cause, "org.omg.CORBA.MARSHAL"))  // see CR 4935098
-                     cause = cause.getCause();
                  if (cause instanceof ClassNotFoundException) {
                      System.out.println("Success: got an IOException " +
                                         "wrapping a ClassNotFoundException");
                  } else {
                      System.out.println("TEST FAILS: Caught IOException (" + e +
--- 254,263 ----