--- old/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java 2016-08-12 17:03:04.000000000 +0300 +++ new/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java 2016-08-12 17:03:04.000000000 +0300 @@ -43,7 +43,7 @@ */ public final class WaveExtensibleFileReader extends SunFileReader { - private static class GUID { + private static final class GUID { private long i1; private int s1; private int s2; @@ -222,7 +222,7 @@ if (!fmt_found || !data_found) { throw new UnsupportedAudioFileException(); } - Map p = new HashMap(); + Map p = new HashMap<>(); String s_channelmask = decodeChannelMask(channelMask); if (s_channelmask != null) p.put("channelOrder", s_channelmask);