diff --git a/src/solaris/classes/sun/java2d/xr/XRDrawLine.java b/src/solaris/classes/sun/java2d/xr/XRDrawLine.java
index 66b595e9455766c638ea9999e0d765a337627fab..d4170c4f59c2d457e1b54d34d3c40673c01088e4 100644
--- a/src/solaris/classes/sun/java2d/xr/XRDrawLine.java
+++ b/src/solaris/classes/sun/java2d/xr/XRDrawLine.java
@@ -224,7 +224,7 @@ public class XRDrawLine {
         outcode2 = outcode(x2, y2, cxmin, cymin, cxmax, cymax);
 
         while ((outcode1 | outcode2) != 0) {
-            int xsteps = 0, ysteps = 0;
+            long xsteps = 0, ysteps = 0;
 
             if ((outcode1 & outcode2) != 0) {
                 return false;
diff --git a/test/java/awt/Graphics/DrawLineTest.java b/test/java/awt/Graphics/DrawLineTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4f1da5274696617166e97a2b32c4dfecfe3379df
--- /dev/null
+++ b/test/java/awt/Graphics/DrawLineTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+  @test
+  @key headful
+  @bug 8235904
+  @run main/othervm/timeout=60 DrawLineTest
+*/
+
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Image;
+
+public class DrawLineTest extends Frame {
+
+    volatile static boolean done = false;
+
+    public static void main(String[] args) throws Exception {
+
+        EventQueue.invokeLater(() -> {
+           DrawLineTest frame = new DrawLineTest();
+           frame.setVisible(true);
+           Image img = frame.createVolatileImage(1000, 1000);
+           img.getGraphics().drawLine(0, 0, 34005, 34005);
+           done = true;
+           frame.setVisible(false);
+           frame.dispose();
+           return;
+        });
+
+        int cnt=0;
+        while (!done && (cnt++ < 60)) {
+            try {
+               Thread.sleep(1000);
+            } catch (InterruptedException e) {
+            }
+        }
+
+        if (!done) {
+           // jtreg will shutdown the test properly
+           if ((System.getProperty("test.src") != null)) {
+               throw new RuntimeException("Test Failed");
+           } else {
+               // Not to be used in jtreg
+               System.out.println("Test failed.");
+               Runtime.getRuntime().halt(-1);
+           }
+        }
+        return;
+    }
+}