Implement IID for nsJavaXPTCStub. Return associated Java object if returning nsJavaXPTCStub.

Original committer: pedemont%us.ibm.com
Original revision: 1.7
Original date: 2004/10/18 17:04:29

extensions/java/xpcom/src/nsJavaWrapper.cpp

@@ -796,38 +796,40 @@ SetRetval(JNIEnv *env, const nsXPTParamInfo &aParamInfo,
     case nsXPTType::T_INTERFACE_IS:
     {
       if (aVariant.val.p) {
-        nsID iid;
-        rv = GetIIDForMethodParam(aIInfo, aMethodInfo, aParamInfo,
-                                  aMethodIndex, aDispatchParams, PR_TRUE, iid);
-        if (NS_FAILED(rv))
-          return rv;
+        jobject java_obj = GetMatchingJavaObject(env, aVariant.val.p);
 
-        jobject java_stub = nsnull;
+        if (java_obj == nsnull) {
+          nsID iid;
+          JavaXPCOMInstance* inst;
+          rv = GetIIDForMethodParam(aIInfo, aMethodInfo, aParamInfo,
+                                    aMethodIndex, aDispatchParams, PR_TRUE, iid);
+          if (NS_FAILED(rv))
+            return rv;
 
-        // wrap XPCOM object
-        nsCOMPtr<nsIInterfaceInfo> info;
-        JavaXPCOMInstance* inst = nsnull;
-        nsCOMPtr<nsIInterfaceInfoManager> iim = XPTI_GetInterfaceInfoManager();
-        NS_ASSERTION(iim != nsnull, "Failed to get InterfaceInfoManager");
-        if (iim) {
-          iim->GetInfoForIID(&iid, getter_AddRefs(info));
+          inst = CreateJavaXPCOMInstance((nsISupports*) aVariant.val.p, &iid);
 
-          inst = new JavaXPCOMInstance((nsISupports*)aVariant.val.p, info);
-          NS_ADDREF((nsISupports*)aVariant.val.p);
-        }
+          if (inst) {
+            // create java stub
+            char* iface_name;
+            inst->InterfaceInfo()->GetName(&iface_name);
+            java_obj = CreateJavaWrapper(env, iface_name);
 
-        if (inst) {
-          // create java stub
-          char* iface_name;
-          info->GetName(&iface_name);
-          java_stub = CreateJavaWrapper(env, iface_name);
-
-          if (java_stub) {
-            AddJavaXPCOMBinding(env, java_stub, inst);
-
-            aResult.l = java_stub;
+            if (java_obj)
+              AddJavaXPCOMBinding(env, java_obj, inst);
           }
         }
+
+        // XXX not sure if this is necessary
+        // If returned object is an nsJavaXPTCStub, release it.
+        nsISupports* xpcom_obj = NS_STATIC_CAST(nsISupports*, aVariant.val.p);
+        nsJavaXPTCStub* stub = nsnull;
+        xpcom_obj->QueryInterface(NS_GET_IID(nsJavaXPTCStub), (void**) &stub);
+        if (stub) {
+          NS_RELEASE(xpcom_obj);
+          NS_RELEASE(stub);
+        }
+
+        aResult.l = java_obj;
       } else {
         aResult.l = nsnull;
       }

extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.h

@@ -103,7 +103,7 @@ extern jclass stringArrayClass;
 
 extern jclass nsISupportsClass;
 
-extern jclass exceptionClass;
+extern jclass xpcomExceptionClass;
 
 PRBool InitializeJavaGlobals(JNIEnv *env);
 void FreeJavaGlobals(JNIEnv* env);

extensions/java/xpcom/src/nsJavaXPTCStub.h

@@ -47,12 +47,16 @@
 #include "nsJavaXPTCStubWeakRef.h"
 
 
+#define NS_JAVAXPTCSTUB_IID \
+{0x88dd8130, 0xebe6, 0x4431, {0x9d, 0xa7, 0xe6, 0xb7, 0x54, 0x74, 0xfb, 0x21}}
+
 class nsJavaXPTCStub : public nsXPTCStubBase,
                        public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISUPPORTSWEAKREFERENCE
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_JAVAXPTCSTUB_IID)
 
   nsJavaXPTCStub(JNIEnv* aJavaEnv, jobject aJavaObject,
                  nsIInterfaceInfo *aIInfo);