Changeset 11472 in josm for trunk/src

Timestamp:

2017-01-16T23:21:57+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14257 - NPE

File:

• trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

@@ -279 +279 @@
                         command.possiblyInterrupt();
                         for (;;) {
-                            int nBytesRead;
-                            nBytesRead = audioInputStream.read(abData, 0, abData.length);
-                            position += nBytesRead / bytesPerSecond;
+                            int nBytesRead = 0;
+                            if (audioInputStream != null) {
+                                nBytesRead = audioInputStream.read(abData, 0, abData.length);
+                                position += nBytesRead / bytesPerSecond;
+                            }
                             command.possiblyInterrupt();
-                            if (nBytesRead < 0) {
+                            if (nBytesRead < 0 || audioInputStream == null || audioOutputLine == null) {
                                 break;
                             }
@@ -290 +292 @@
                         }
                         // end of audio, clean up
-                        audioOutputLine.drain();
-                        audioOutputLine.close();
+                        if (audioOutputLine != null) {
+                            audioOutputLine.drain();
+                            audioOutputLine.close();
+                        }
                         audioOutputLine = null;
                         Utils.close(audioInputStream);