From 11215eaec0ee3b14be940f0bfb80983ac495999f Mon Sep 17 00:00:00 2001 From: Semyon Sadetsky Date: Tue, 12 May 2015 09:22:53 +0300 Subject: [PATCH] 8078483: Apparent endless loop running JEditorPanePaintTest Reviewed-by: serb, alexsch --- .../share/classes/javax/swing/plaf/basic/BasicTextUI.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java index 3b38e77d94d..1567a76c4c4 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java @@ -936,8 +936,9 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory { ((AbstractDocument)doc).readLock(); } try { - if ((d.width > (i.left + i.right)) && (d.height > (i.top + i.bottom))) { - rootView.setSize(d.width - i.left - i.right, d.height - i.top - i.bottom); + if ((d.width > (i.left + i.right + caretMargin)) && (d.height > (i.top + i.bottom))) { + rootView.setSize(d.width - i.left - i.right - + caretMargin, d.height - i.top - i.bottom); } else if (d.width == 0 || d.height == 0) { // Probably haven't been layed out yet, force some sort of