[Sblim-commit] sfcb brokerUpc.c, 1.34, 1.35 ChangeLog, 1.691, 1.692 NEWS, 1.615, 1.616

[Chris B. <buc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv3929

Modified Files:
	brokerUpc.c ChangeLog NEWS 
Log Message:
[ 3414700 ] assocClass ignored for assoc upcalls

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -d -r1.615 -r1.616
--- NEWS	29 Sep 2011 16:04:10 -0000	1.615
+++ NEWS	30 Sep 2011 16:11:36 -0000	1.616
@@ -1,3 +1,10 @@
+Changes in 1.3.14
+=================
+
+Bugs fixed: 
+
+- 3414700 assocClass ignored for assoc upcalls
+
 Changes in 1.3.13
 =================
 

Index: brokerUpc.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/brokerUpc.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- brokerUpc.c	22 Jun 2011 19:55:18 -0000	1.34
+++ brokerUpc.c	30 Sep 2011 16:11:36 -0000	1.35
@@ -217,13 +217,21 @@
 static void setContext(BinRequestContext * binCtx, OperationHdr * oHdr,
                        BinRequestHdr * bHdr, int size, 
 		       const CMPIContext    * ctx,
-		       const CMPIObjectPath * cop)
+                       const CMPIObjectPath * cop, 
+                       const char * assocClass,
+                       const char * resultClass)
 {
    CMPIData ctxData;
    memset(binCtx,0,sizeof(BinRequestContext));
    oHdr->nameSpace = setCharsMsgSegment((char *)
                           ClObjectPathGetNameSpace((ClObjectPath *) cop->hdl));
-   if (oHdr->type < OPS_Associators || oHdr->type > OPS_ReferenceNames) {
+   if (assocClass) {
+      oHdr->className = setCharsMsgSegment(assocClass);
+   }
+   else if (resultClass) {
+      oHdr->className = setCharsMsgSegment(resultClass);
+   }
+   else if (oHdr->type < OPS_Associators || oHdr->type > OPS_ReferenceNames) {
       oHdr->className = setCharsMsgSegment((char *)
                           ClObjectPathGetClassName((ClObjectPath *) cop->hdl));
    } else {
@@ -347,7 +355,7 @@
       	 }
       	 bhdr->count+=i;      	 
       }
-      setContext(&binCtx, oHdr, bhdr, sreqSize, context, cop);
+      setContext(&binCtx, oHdr, bhdr, sreqSize, context, cop, assocclass, resultclass);
 
       checkReroute(broker, context, oHdr);
 
@@ -493,7 +501,7 @@
       sreq->hdr.count=ps+2;
       sreq->hdr.operation=OPS_GetInstance;
    
-      setContext(&binCtx, &oHdr, &sreq->hdr, sreqSize, context, cop);
+      setContext(&binCtx, &oHdr, &sreq->hdr, sreqSize, context, cop, NULL, NULL);
       _SFCB_TRACE(1,("--- for %s %s",(char*)oHdr.nameSpace.data,(char*)oHdr.className.data));
       
       checkReroute(broker, context, &oHdr);
@@ -584,7 +592,7 @@
    
       lockUpCall(broker);
    
-      setContext(&binCtx, &oHdr, &sreq.hdr, sizeof(sreq), context, cop);
+      setContext(&binCtx, &oHdr, &sreq.hdr, sizeof(sreq), context, cop, NULL, NULL);
       _SFCB_TRACE(1,("--- for %s %s",(char*)oHdr.nameSpace.data,(char*)oHdr.className.data)); 
 
       sreq.instance = setInstanceMsgSegment(inst);
@@ -673,7 +681,7 @@
       sreq->hdr.count=ps+3;
       sreq->hdr.operation=OPS_ModifyInstance;
       
-      setContext(&binCtx, &oHdr, &sreq->hdr, sreqSize, context, cop);
+      setContext(&binCtx, &oHdr, &sreq->hdr, sreqSize, context, cop, NULL, NULL);
       _SFCB_TRACE(1,("--- for %s %s",(char*)oHdr.nameSpace.data,(char*)oHdr.className.data));
       
       checkReroute(broker, context, &oHdr); 
@@ -743,7 +751,7 @@
    
       lockUpCall(broker);
    
-      setContext(&binCtx, &oHdr, &sreq.hdr, sizeof(sreq), context, cop);
+      setContext(&binCtx, &oHdr, &sreq.hdr, sizeof(sreq), context, cop, NULL, NULL);
       _SFCB_TRACE(1,("--- for %s %s",(char*)oHdr.nameSpace.data,(char*)oHdr.className.data));
       
       checkReroute(broker, context, &oHdr); 
@@ -809,7 +817,7 @@
    
       lockUpCall(broker);
    
-      setContext(&binCtx, &oHdr, &sreq.hdr, sizeof(sreq), context, cop);
+      setContext(&binCtx, &oHdr, &sreq.hdr, sizeof(sreq), context, cop, NULL, NULL);
       _SFCB_TRACE(1,("--- for %s %s",(char*)oHdr.nameSpace.data,(char*)oHdr.className.data)); 
       
       sreq.query = setCharsMsgSegment(query);
@@ -1033,7 +1041,7 @@
       
       lockUpCall(broker);
       
-      setContext(&binCtx, &oHdr, &sreq->hdr, size, context, cop);
+      setContext(&binCtx, &oHdr, &sreq->hdr, size, context, cop, NULL, NULL);
       
       sreq->in = setArgsMsgSegment(in);
       sreq->out = setArgsMsgSegment(NULL);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -d -r1.691 -r1.692
--- ChangeLog	29 Sep 2011 19:56:39 -0000	1.691
+++ ChangeLog	30 Sep 2011 16:11:36 -0000	1.692
@@ -1,3 +1,8 @@
+2011-09-30  Chris Buccella  <buc...@li...>
+
+	* brokerUpc.c:
+	[ 3414700 ] assocClass ignored for assoc upcalls
+
 2011-09-29  Chris Buccella  <buc...@li...>
 
 	* test/TestProviders/cmpiTestInstanceProvider.c