Mercurial > hg > release > icedtea7-2.2
changeset 2267:c4a1546cbcbd
Fix bug causing 100% CPU usage (rhbz# 592553).
2010-06-14 Deepak Bhole <dbhole@redhat.com>
* plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug
causing 100% CPU usage (rhbz# 592553).
| author | Deepak Bhole <dbhole@redhat.com> |
|---|---|
| date | Mon, 14 Jun 2010 15:03:55 -0400 |
| parents | 4b85fc5edffb |
| children | 4fed9f38e501 |
| files | ChangeLog plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 15 17:09:31 2010 +0100 +++ b/ChangeLog Mon Jun 14 15:03:55 2010 -0400 @@ -1,3 +1,8 @@ +2010-06-14 Deepak Bhole <dbhole@redhat.com> + + * plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java: Fix bug + causing 100% CPU usage (rhbz# 592553). + 2010-06-14 Omair Majid <omajid@redhat.com> PR icedtea/488
--- a/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Tue Jun 15 17:09:31 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java Mon Jun 14 15:03:55 2010 -0400 @@ -164,11 +164,11 @@ registerPriorityWait("instance " + instanceNum + " handle"); registerPriorityWait("instance " + instanceNum + " width"); - } else if (msgParts[2].equals("handle") || msgParts[2].equals("width")) { + } else if (msgParts[2].equals("handle")) { Integer instanceNum = new Integer(msgParts[1]); // If this instance is not in init, return false immediately. - // Handle/Width messages should NEVER go before tag messages + // Handle messages should NEVER go before tag messages if (!isInInit(instanceNum)) return false; }
--- a/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Tue Jun 15 17:09:31 2010 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java Mon Jun 14 15:03:55 2010 -0400 @@ -72,7 +72,7 @@ if (message != null) { - PluginDebug.debug("Consumer thread " + id + " consuming " + message); + PluginDebug.debug("Consumer (priority=" + isPriorityWorker + ") thread " + id + " consuming " + message); // ideally, whoever returns things object should mark it // busy first, but just in case.. @@ -90,7 +90,7 @@ this.message = null; - PluginDebug.debug("Consumption completed by consumer thread " + id); + PluginDebug.debug("Consumption (priority=" + isPriorityWorker + ") completed by consumer thread " + id); // mark ourselves free again free();