rpms/java-1.6.0-openjdk/F-11 java-1.6.0-openjdk-plugin.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.140, 1.141

[Martin Matejovic]

Author: mmatejov

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11036

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-plugin.patch 
Log Message:

* Thu Jun 17 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-36.b18
- Fixed plugin cpu usage issue
- Fixed plugin rewrites ? in URL
- Added java-1.6.0-openjdk-plugin.patch
- Resovles: rhbz#598353
- Resolves: rhbz#592553


java-1.6.0-openjdk-plugin.patch:
 IcedTeaPluginUtils.h                            |    4 ++--
 java/sun/applet/PluginMessageConsumer.java      |    4 ++--
 java/sun/applet/PluginMessageHandlerWorker.java |    9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

--- NEW FILE java-1.6.0-openjdk-plugin.patch ---
--- plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java_back	2010-06-15 09:22:46.327336487 +0200
+++ plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java	2010-06-15 09:24:04.254334852 +0200
@@ -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;
 	    }
--- plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java_back	2010-06-15 09:25:19.852584496 +0200
+++ plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java	2010-06-15 09:27:22.124346502 +0200
@@ -71,8 +71,8 @@
 		while (true) {
 
 			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..
@@ -89,9 +89,8 @@
 				}
 
 				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();
 				
--- plugin/icedteanp/IcedTeaPluginUtils.h_back	2010-06-15 09:54:46.700361097 +0200
+++ plugin/icedteanp/IcedTeaPluginUtils.h	2010-06-15 09:55:44.410346382 +0200
@@ -137,8 +137,8 @@
 }
 
 #define HEX_TO_INT(c) \
-    ((*c >= 'A') ? *c - 'A' + 10 : \
-     (*c >= 'a') ? *c - 'a' + 10 : \
+    ((*c >= 'a') ? *c - 'a' + 10 : \
+    (*c >= 'A') ? *c - 'A' + 10 : \ 
      *c - '0')
 
 #define IS_VALID_HEX(c) \


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- java-1.6.0-openjdk.spec	12 May 2010 14:33:23 -0000	1.140
+++ java-1.6.0-openjdk.spec	17 Jun 2010 11:39:01 -0000	1.141
@@ -144,7 +144,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 35.%{openjdkver}%{?dist}
+Release: 36.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -181,6 +181,7 @@ Patch1:   java-1.6.0-openjdk-java-access
 Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
 Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
+Patch5:   java-1.6.0-openjdk-plugin.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -396,6 +397,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
+%patch5
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -836,9 +838,11 @@ if [ $1 -gt 1 ]
 then
   alternatives --remove %{javaplugin} \
     %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null
-
 fi
 
+alternatives --remove %{javaplugin} \
+  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null  	
+
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
   %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
@@ -969,6 +973,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Jun 17 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-36.b18
+- Fixed plugin cpu usage issue
+- Fixed plugin rewrites ? in URL
+- Added java-1.6.0-openjdk-plugin.patch
+- Resovles: rhbz#598353
+- Resolves: rhbz#592553
+
 * Tue Apr 20 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-35.b18
 - Added icedtea6-1.8
 - Added openjdk b18