aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--plugin/icedteanp/java/sun/applet/PluginAppletViewer.java13
3 files changed, 9 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b579d7..8a7c2bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-17 Adam Domurad <[email protected]>
+
+ Fix PR854: Resizing an applet several times causes 100% CPU load
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (handleMessage): Replace buggy initialization wait.
+
2013-05-14 Jiri Vanek <[email protected]>
Jacob Wisor <[email protected]>
diff --git a/NEWS b/NEWS
index 4a56ee0..a40a6ea 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ GX - http://bugs.gentoo.org/show_bug.cgi?id=X
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 1.5 (2013-XX-XX):
+* Plugin
+ - PR854: Resizing an applet several times causes 100% CPU load
New in release 1.4 (2013-XX-XX):
* Added cs localization
diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
index 1f56037..3feedd6 100644
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
@@ -665,18 +665,7 @@ public class PluginAppletViewer extends XEmbeddedFrame
if (message.startsWith("width")) {
// Wait for panel to come alive
- long maxTimeToSleep = APPLET_TIMEOUT;
- statusLock.lock();
- try {
- while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
- maxTimeToSleep > 0) {
- maxTimeToSleep -= waitTillTimeout(statusLock, initComplete,
- maxTimeToSleep);
- }
- }
- finally {
- statusLock.unlock();
- }
+ waitForAppletInit(panel);
// 0 => width, 1=> width_value, 2 => height, 3=> height_value
String[] dimMsg = message.split(" ");