/hg/icedtea-web: 4 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Fri May 27 15:09:44 PDT 2011
changeset 9cf54e1ace44 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9cf54e1ace44
author: Deepak Bhole <dbhole at redhat.com>
date: Fri May 27 17:03:25 2011 -0400
Backed out 0256de6a4bf6 as it is prone to race conditions.
changeset c73d453f811b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c73d453f811b
author: Deepak Bhole <dbhole at redhat.com>
date: Fri May 27 17:27:55 2011 -0400
Call dispose() from swing thread when applet is closed.
Do not stop applet threadgroup on exit.
changeset 1d10dbc851d7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1d10dbc851d7
author: Deepak Bhole <dbhole at redhat.com>
date: Fri May 27 18:00:02 2011 -0400
PR735: Firefox 4 sometimes freezes if the applet calls
showDocument()
changeset 7f0a8910a2a8 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7f0a8910a2a8
author: Deepak Bhole <dbhole at redhat.com>
date: Fri May 27 18:01:27 2011 -0400
Fix PR723: AccessControlException while downloading resource
diffstat:
ChangeLog | 36 +++++++
NEWS | 1 +
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 18 +++-
plugin/icedteanp/IcedTeaNPPlugin.cc | 21 +----
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 74 +++++++++++++++-
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 4 +
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 20 +--
7 files changed, 138 insertions(+), 36 deletions(-)
diffs (308 lines):
diff -r cce92a1211ae -r 7f0a8910a2a8 ChangeLog
--- a/ChangeLog Fri May 27 12:45:05 2011 -0400
+++ b/ChangeLog Fri May 27 18:01:27 2011 -0400
@@ -1,3 +1,39 @@
+2011-05-27 Deepak Bhole <dbhole at redhat.com>
+
+ PR723: AccessControlException while downloading resource
+ * netx/net/sourceforge/jnlp/cache/ResourceTracker.java
+ (Downloader): Make class private.
+ (Downloader::run): Call processResource via doPrivileged since
+ resources may get added at run time from application code via
+ JNLPClassLoader::addNewJar().
+
+2011-05-27 Deepak Bhole <dbhole at redhat.com>
+
+ PR735: Firefox 4 sometimes freezes if the applet calls showDocument()
+ * plugin/icedteanp/IcedTeaNPPlugin.cc (consume_message): Defer handling to
+ url load request to the queue processor.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (PluginRequestProcessor::newMessageOnBus): Handle new LoadURL command.
+ (PluginRequestProcessor::loadURL): New method. Loads the specified url in
+ the given target.
+ (queue_processor): Process the LoadURL command.
+ (_loadURL): New async callback function to handle LoadURL commands.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Add _loadURL and
+ loadURL method declerations.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (showDocument):
+ Send the url load command in the standard "instance X reference Y
+ <command> <args>" format.
+
+2011-05-27 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (appletClose): Call dispose from the swing thread. Also, don't try to stop
+ the threadgroup.
+
+2011-05-27 Deepak Bhole <dbhole at redhat.com>
+
+ * Backed out 0256de6a4bf6
+
2011-05-27 Omair Majid <omajid at redhat.com>
* NEWS: Update.
diff -r cce92a1211ae -r 7f0a8910a2a8 NEWS
--- a/NEWS Fri May 27 12:45:05 2011 -0400
+++ b/NEWS Fri May 27 18:01:27 2011 -0400
@@ -33,6 +33,7 @@
- PR475, RH604061: Allow applets from the same page to use the same classloader
- PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read)
- PR664: Sound doesn't play on runescape.com.
+ - PR735: Firefox 4 sometimes freezes if the applet calls showDocument()
New in release 1.0 (2010-XX-XX):
diff -r cce92a1211ae -r 7f0a8910a2a8 netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 27 12:45:05 2011 -0400
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 27 18:01:27 2011 -0400
@@ -28,6 +28,8 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -1078,7 +1080,7 @@
/**
* This class downloads and initializes the queued resources.
*/
- class Downloader implements Runnable {
+ private class Downloader implements Runnable {
Resource resource = null;
public void run() {
@@ -1100,7 +1102,19 @@
}
try {
- processResource(resource);
+
+ // Resource processing involves writing to files
+ // (cache entry trackers, the files themselves, etc.)
+ // and it therefore needs to be privileged
+
+ final Resource fResource = resource;
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ processResource(fResource);
+ return null;
+ }
+ });
+
} catch (Exception ex) {
if (JNLPRuntime.isDebug())
ex.printStackTrace();
diff -r cce92a1211ae -r 7f0a8910a2a8 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 27 12:45:05 2011 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 27 18:01:27 2011 -0400
@@ -1169,26 +1169,7 @@
data = (ITNPPluginData*) instance->pdata;
}
- if (g_str_has_prefix (parts[2], "url"))
- {
- // Open the URL in a new browser window.
- gchar* decoded_url = (gchar*) calloc(strlen(parts[3]) + 1, sizeof(gchar));
- IcedTeaPluginUtilities::decodeURL(parts[3], &decoded_url);
-
- PLUGIN_DEBUG ("plugin_in_pipe_callback: opening URL %s\n", decoded_url);
- PLUGIN_DEBUG ("plugin_in_pipe_callback: URL target %s\n", parts[4]);
-
- NPError np_error =
- (*browser_functions.geturlnotify) (data->owner, decoded_url, parts[4], NULL);
-
-
- if (np_error != NPERR_NO_ERROR)
- PLUGIN_ERROR ("Failed to load URL.");
-
- g_free(decoded_url);
- decoded_url = NULL;
- }
- else if (g_str_has_prefix (parts[2], "status"))
+ if (g_str_has_prefix (parts[2], "status"))
{
// clear the "instance X status" parts
diff -r cce92a1211ae -r 7f0a8910a2a8 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri May 27 12:45:05 2011 -0400
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri May 27 18:01:27 2011 -0400
@@ -130,11 +130,12 @@
!command->find("GetSlot") ||
!command->find("SetSlot") ||
!command->find("Eval") ||
- !command->find("Finalize"))
+ !command->find("Finalize") ||
+ !command->find("LoadURL"))
{
// Update queue synchronously
- pthread_mutex_lock(&message_queue_mutex);
+ pthread_mutex_lock(&message_queue_mutex);
message_queue->push_back(message_parts);
pthread_mutex_unlock(&message_queue_mutex);
@@ -714,6 +715,38 @@
plugin_to_java_bus->post(response.c_str());
}
+/**
+ * Fetches the URL and loads it into the given target
+ *
+ * @param message_parts The request message.
+ */
+void
+PluginRequestProcessor::loadURL(std::vector<std::string*>* message_parts)
+{
+
+ int id = atoi(message_parts->at(1)->c_str());
+
+ AsyncCallThreadData thread_data = AsyncCallThreadData();
+ thread_data.result_ready = false;
+ thread_data.parameters = std::vector<void*>();
+ thread_data.result = std::string();
+
+ NPP instance;
+ get_instance_from_id(id, instance);
+
+ // If instance is invalid, do not proceed further
+ if (!instance)
+ return;
+
+ thread_data.parameters.push_back(instance);
+ thread_data.parameters.push_back(message_parts->at(5)); // push url
+ thread_data.parameters.push_back(message_parts->at(6)); // push target
+
+ thread_data.result_ready = false;
+ browser_functions.pluginthreadasynccall(instance, &_loadURL, &thread_data);
+ while (!thread_data.result_ready) usleep(2000); // wait till ready
+}
+
static void
queue_cleanup(void* data)
{
@@ -794,6 +827,12 @@
pthread_mutex_lock(&syn_write_mutex);
processor->finalize(message_parts);
pthread_mutex_unlock(&syn_write_mutex);
+ } else if (command == "LoadURL") // For instance X url <url> <target>
+ {
+ // write methods are synchronized
+ pthread_mutex_lock(&syn_write_mutex);
+ processor->loadURL(message_parts);
+ pthread_mutex_unlock(&syn_write_mutex);
} else
{
// Nothing matched
@@ -1014,3 +1053,34 @@
PLUGIN_DEBUG("_getString returning\n");
}
+void
+_loadURL(void* data) {
+
+ PLUGIN_DEBUG("_loadURL called\n");
+
+ NPP instance;
+ std::string* url;
+ std::string* target;
+
+ std::vector<void*> parameters = ((AsyncCallThreadData*) data)->parameters;
+
+ instance = (NPP) parameters.at(0);
+ url = (std::string*) parameters.at(1);
+ target = (std::string*) parameters.at(2);
+
+ PLUGIN_DEBUG("Launching %s in %s\n", url->c_str(), target->c_str());
+
+ // Each decode can expand to 4 chars at the most
+ gchar* decoded_url = (gchar*) calloc(strlen(url->c_str())*4 + 1, sizeof(gchar));
+ IcedTeaPluginUtilities::decodeURL(url->c_str(), &decoded_url);
+
+ ((AsyncCallThreadData*) data)->call_successful =
+ (*browser_functions.geturl) (instance, decoded_url, target->c_str());
+
+ ((AsyncCallThreadData*) data)->result_ready = true;
+
+ g_free(decoded_url);
+ decoded_url = NULL;
+
+ PLUGIN_DEBUG("_loadURL returning %d\n", ((AsyncCallThreadData*) data)->call_successful);
+}
diff -r cce92a1211ae -r 7f0a8910a2a8 plugin/icedteanp/IcedTeaPluginRequestProcessor.h
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Fri May 27 12:45:05 2011 -0400
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Fri May 27 18:01:27 2011 -0400
@@ -83,6 +83,7 @@
void _call(void* data);
void _eval(void* data);
void _getString(void* data);
+void _loadURL(void* data);
void* queue_processor(void* data);
@@ -138,6 +139,9 @@
/* Decrements reference count for given object */
void finalize(std::vector<std::string*>* message_parts);
+
+ /* Loads a URL into the specified target */
+ void loadURL(std::vector<std::string*>* message_parts);
};
#endif // __ICEDTEAPLUGINREQUESTPROCESSOR_H__
diff -r cce92a1211ae -r 7f0a8910a2a8 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 27 12:45:05 2011 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 27 18:01:27 2011 -0400
@@ -928,8 +928,8 @@
*/
public void showDocument(URL url, String target) {
try {
- // FIXME: change to postCallRequest
- write("url " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target);
+ Long reference = getRequestIdentifier();
+ write("reference " + reference + " LoadURL " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target);
} catch (IOException exception) {
// Deliberately ignore IOException. showDocument may be
// called from threads other than the main thread after
@@ -1621,13 +1621,10 @@
if (cl instanceof JNLPClassLoader.CodeBaseClassLoader)
cl = ((JNLPClassLoader.CodeBaseClassLoader) cl).getParentJNLPClassLoader();
+ ThreadGroup tg = ((JNLPClassLoader) cl).getApplication().getThreadGroup();
+
appletShutdown(p);
appletPanels.removeElement(p);
-
- /* TODO: Applets don't always shut down nicely. We
- * need to find a proper way to forcibly closing all threads
- * an applet starts during its lifetime
- */
try {
SwingUtilities.invokeAndWait(new Runnable() {
@@ -1638,9 +1635,6 @@
} catch (Exception e) { // ignore, we are just disposing it
}
- // If there are no more applets running, exit the VM
- // TODO: There is a possible race condition here as count
- // can be 0 when an applet is in the initialization phase
if (countApplets() == 0) {
appletSystemExit();
}
@@ -1651,10 +1645,12 @@
}
/**
- * This function should be called to halt the VM when all applets are destroyed.
+ * Exit the program.
+ * Exit from the program (if not stand alone) - do no clean-up
*/
private void appletSystemExit() {
- System.exit(0);
+ // Do nothing. Exit is handled by another
+ // block of code, called when _all_ applets are gone
}
/**
More information about the distro-pkg-dev
mailing list