--- a/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java	Fri Nov 27 17:13:02 2009 +0300
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java	Fri Nov 27 17:36:34 2009 +0300
@@ -218,6 +218,15 @@
     }
 
     private int findFreeVoice(int x) {
+        if(x == -1)
+        {
+            // x = -1 means that there where no available voice
+            // last time we called findFreeVoice
+            // and it hasn't changed because no audio has been
+            // rendered in the meantime.
+            // Therefore we have to return -1.
+            return -1;
+        }
         for (int i = x; i < voices.length; i++)
             if (!voices[i].active)
                 return i;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java	Fri Nov 27 17:36:34 2009 +0300
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @summary Test SoftChannel overflow test 2 */
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.sound.midi.MidiChannel;
+import javax.sound.midi.Patch;
+import javax.sound.midi.VoiceStatus;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+
+import com.sun.media.sound.AudioSynthesizer;
+import com.sun.media.sound.SF2Instrument;
+import com.sun.media.sound.SF2InstrumentRegion;
+import com.sun.media.sound.SF2Layer;
+import com.sun.media.sound.SF2LayerRegion;
+import com.sun.media.sound.SF2Region;
+import com.sun.media.sound.SF2Sample;
+import com.sun.media.sound.SF2Soundbank;
+import com.sun.media.sound.SoftSynthesizer;
+
+public class NoteOverFlowTest2 {
+
+    public static void main(String[] args) throws Exception
+    {
+        // Create instance of the synthesizer with very low polyphony
+        AudioSynthesizer synth = new SoftSynthesizer();
+        AudioFormat format = new AudioFormat(44100, 16, 2, true, false);
+        Map<String, Object> p = new HashMap<String, Object>();
+        p.put("max polyphony", new Integer(5));
+        AudioInputStream stream = synth.openStream(format, p);
+
+        // Create instrument with too many regions (more than max polyphony)
+        SF2Soundbank sf2 = new SF2Soundbank();
+
+        SF2Sample sample = new SF2Sample(sf2);
+        sample.setName("test sample");
+        sample.setData(new byte[100]);
+        sample.setSampleRate(44100);
+        sample.setOriginalPitch(20);
+        sf2.addResource(sample);
+
+        SF2Layer layer = new SF2Layer(sf2);
+        layer.setName("test layer");
+        sf2.addResource(layer);
+
+        for (int i = 0; i < 100; i++) {
+            SF2LayerRegion region = new SF2LayerRegion();
+            region.setSample(sample);
+            layer.getRegions().add(region);
+        }
+
+        SF2Instrument ins = new SF2Instrument(sf2);
+        ins.setPatch(new Patch(0,0));
+        ins.setName("test instrument");
+        sf2.addInstrument(ins);
+
+        SF2InstrumentRegion insregion = new SF2InstrumentRegion();
+        insregion.setLayer(layer);
+        ins.getRegions().add(insregion);
+
+        // Load the test soundbank into the synthesizer
+        synth.unloadAllInstruments(synth.getDefaultSoundbank());
+        synth.loadAllInstruments(sf2);
+
+        // Send out one midi on message
+        MidiChannel ch1 = synth.getChannels()[0];
+        ch1.programChange(0);
+        ch1.noteOn(64, 64);
+
+        // Read 1 sec from stream
+        stream.skip(format.getFrameSize() * ((int)(format.getFrameRate() * 2)));
+
+        // Close the synthesizer after use
+        synth.close();
+    }
+}