--- old/src/jdk.jdi/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java	2016-04-27 14:31:06.981155602 -0700
+++ new/src/jdk.jdi/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java	2016-04-27 14:31:06.821155597 -0700
@@ -53,17 +53,19 @@
         super();
 
         try {
-            Class<?> c = Class.forName("com.sun.tools.jdi.SharedMemoryTransportService");
-            transportService = (TransportService)c.newInstance();
+            @SuppressWarnings("deprecation")
+            Object o =
+                Class.forName("com.sun.tools.jdi.SharedMemoryTransportService").newInstance();
+            transportService = (TransportService)o;
             transport = new Transport() {
                 public String name() {
                     return "dt_shmem";
                 }
             };
-        } catch (ClassNotFoundException x) {
-        } catch (UnsatisfiedLinkError x) {
-        } catch (InstantiationException x) {
-        } catch (IllegalAccessException x) {
+        } catch (ClassNotFoundException |
+                 UnsatisfiedLinkError |
+                 InstantiationException |
+                 IllegalAccessException x) {
         };
 
         if (transportService == null) {