--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java	Thu Jan 29 15:34:50 2009 +0300
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java	Thu Jan 29 19:06:29 2009 +0300
@@ -836,18 +836,24 @@
      */
     protected Integer getHighestValue() {
         Dictionary dictionary = slider.getLabelTable();
-        if (dictionary != null) {
-            Enumeration keys = dictionary.keys();
-            int max = slider.getMinimum() - 1;
-            while (keys.hasMoreElements()) {
-                max = Math.max(max, ((Integer)keys.nextElement()).intValue());
+
+        if (dictionary == null) {
+            return null;
+        }
+
+        Enumeration keys = dictionary.keys();
+
+        Integer max = null;
+
+        while (keys.hasMoreElements()) {
+            Integer i = (Integer) keys.nextElement();
+
+            if (max == null || i > max) {
+                max = i;
             }
-            if (max == slider.getMinimum() - 1) {
-                return null;
-            }
-            return max;
         }
-        return null;
+
+        return max;
     }
 
     /**
@@ -859,18 +865,24 @@
      */
     protected Integer getLowestValue() {
         Dictionary dictionary = slider.getLabelTable();
-        if (dictionary != null) {
-            Enumeration keys = dictionary.keys();
-            int min = slider.getMaximum() + 1;
-            while (keys.hasMoreElements()) {
-                min = Math.min(min, ((Integer)keys.nextElement()).intValue());
+
+        if (dictionary == null) {
+            return null;
+        }
+
+        Enumeration keys = dictionary.keys();
+
+        Integer min = null;
+
+        while (keys.hasMoreElements()) {
+            Integer i = (Integer) keys.nextElement();
+
+            if (min == null || i < min) {
+                min = i;
             }
-            if (min == slider.getMaximum() + 1) {
-                return null;
-            }
-            return min;
         }
-        return null;
+
+        return min;
     }
 
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6794836/bug6794836.java	Thu Jan 29 19:06:29 2009 +0300
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ *
+ * 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
+ * @bug 6794836
+ * @summary BasicSliderUI throws NullPointerExc when JSlider maximum is Integer.MAX_VALUE
+ * @author Pavel Porvatov
+ * @run main bug6794836
+ */
+
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicSliderUI;
+import java.lang.reflect.Method;
+import java.util.Hashtable;
+
+public class bug6794836 {
+    public static void main(String[] args) throws Exception {
+        new bug6794836().run();
+    }
+
+    public void run() throws Exception {
+        JSlider slider = new JSlider(0, Integer.MAX_VALUE);
+
+        slider.setPaintLabels(true);
+
+        JLabel minLabel = new JLabel("Min");
+        JLabel maxLabel = new JLabel("Max");
+
+        Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
+
+        labelTable.put(Integer.MIN_VALUE, minLabel);
+        labelTable.put(Integer.MAX_VALUE, maxLabel);
+
+        slider.setLabelTable(labelTable);
+
+        BasicSliderUI ui = (BasicSliderUI) slider.getUI();
+
+        if (invokeMethod("getHighestValueLabel", ui) != maxLabel) {
+            fail("invalid getHighestValueLabel result");
+        }
+
+        if (invokeMethod("getLowestValueLabel", ui) != minLabel) {
+            fail("invalid getLowestValueLabel result");
+        }
+
+        System.out.println("The bug6794836 test passed");
+    }
+
+    private static Object invokeMethod(String name, BasicSliderUI ui) throws Exception {
+        Method method = BasicSliderUI.class.getDeclaredMethod(name, null);
+
+        method.setAccessible(true);
+
+        return method.invoke(ui, null);
+    }
+
+    private static void fail(String s) {
+        throw new RuntimeException("Test failed: " + s);
+    }
+}