Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed the finalize method to release the wrapped plugin instance.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24447 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com
1999-03-19 14:35:50 +00:00
parent d66fd18df8
commit dfd23759b9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
View File

@@ -608,8 +608,8 @@ Java_netscape_javascript_JSObject_getWindow(JNIEnv* env,
MRJPluginInstance* pluginInstance = theJVMPlugin->getPluginInstance(java_applet_obj);
if (pluginInstance != NULL) {
#ifdef MRJPLUGIN_4X
// keep an extra reference to the plugin instance, until it is finalized.
jobject jwindow = Wrap_JSObject(env, jsobject(pluginInstance));
pluginInstance->Release();
return jwindow;
#else
jsobject jswindow = NULL;
@@ -634,6 +634,10 @@ Java_netscape_javascript_JSObject_finalize(JNIEnv* env, jobject java_wrapper_obj
{
jsobject jsobj = Unwrap_JSObject(env, java_wrapper_obj);
#ifdef MRJPLUGIN_4X
MRJPluginInstance* pluginInstance = (MRJPluginInstance*)jsobj;
NS_IF_RELEASE(pluginInstance);
#else
class FinalizeMessage : public JavaMessage {
jsobject m_jsobj;
public:
@@ -649,4 +653,5 @@ Java_netscape_javascript_JSObject_finalize(JNIEnv* env, jobject java_wrapper_obj
};
FinalizeMessage msg(jsobj);
sendMessage(env, &msg);
#endif
}