* NOT PART OF TBOX BUILDS *

Fixed bug with sending NULL pointer to object

java/xpcom/java/test/bcJavaSample.java

@@ -34,6 +34,7 @@ public class bcJavaSample implements bcIJavaSample {
         } else {
             result = null;
         }
+        System.out.println("--[java]bcJavaSample::queryInterface result=null"+(result==null));
     }
     public void test0() {
         System.out.println("--[java]bcJavaSample.test0 ");

java/xpcom/xpcom/bcXPCOMMarshalToolkit.cpp

@@ -360,7 +360,7 @@ bcXPCOMMarshalToolkit::UnMarshalElement(void *data, bcIUnMarshaler *um, nsXPTPar
                     printf("%d oid",(int) oid);
                     nsIID iid;
                     um->ReadSimple(&iid,bc_T_IID);
-                    nsISupports *proxy;
+                    nsISupports *proxy = NULL;
                     if (oid != 0) {
                         NS_WITH_SERVICE(bcORB, _orb, kORBCIID, &r);
                         if (NS_FAILED(r)) {

java/xpcom/xpcom/bcXPCOMProxy.cpp

@@ -89,7 +89,7 @@ nsrefcnt bcXPCOMProxy::AddRef(void) {
 
 nsrefcnt bcXPCOMProxy::Release(void) {
     nsrefcnt cnt = (nsrefcnt) PR_AtomicDecrement((PRInt32*)&mRefCnt);
-    printf("--[c++] bcXPCOMProxy::AddRef %d\n",(unsigned)cnt);
+    printf("--[c++] bcXPCOMProxy::Release %d\n",(unsigned)cnt);
     if(0 == cnt) {  
         delete this;
     }