[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-145-g222f4ea

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".

The branch, master has been updated
       via  222f4ea21fcf8fe3ac3058e7d9564dd6cf4e62c4 (commit)
      from  c39bf3a57a557a6fcb7de5aeeadcde369035d453 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 222f4ea21fcf8fe3ac3058e7d9564dd6cf4e62c4
Author: buccella <buc...@li...>
Date:   Fri Sep 30 12:24:45 2011 -0400

    [ 3414700 ] assocClass ignored for assoc upcalls

-----------------------------------------------------------------------

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index fcb142b..c07653e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-30  Chris Buccella  <buc...@li...>
+
+	* brokerUpc:
+	[ 3414700 ] assocClass ignored for assoc upcalls
+
 2011-09-28  Narasimha Sharoff  <nsh...@us...>
 
 	* providerDrv.c:
diff --git a/NEWS b/NEWS
index 4296ce1..342b0f6 100644
--- a/NEWS
+++ b/NEWS
@@ -81,6 +81,13 @@ Everything in 1.3.10, plus:
 - 3104761 cimRsRequest.h missing from make-dist tarball
 - 3107553 Remove Large Volume Support
 
+Changes in 1.3.14
+=================
+
+Bugs Fixed: 
+
+- 3414700 assocClass ignored for assoc upcalls
+
 Changes in 1.3.13
 =================
 
diff --git a/brokerUpc.c b/brokerUpc.c
index bdad519..e823e80 100644
--- a/brokerUpc.c
+++ b/brokerUpc.c
@@ -228,13 +228,21 @@ setErrorStatus(int code)
 static void
 setContext(BinRequestContext * binCtx, OperationHdr * oHdr,
            BinRequestHdr * bHdr, int size,
-           const CMPIContext *ctx, const CMPIObjectPath * cop)
+           const CMPIContext *ctx, 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 {
@@ -370,7 +378,7 @@ genericEnumRequest(const CMPIBroker * broker,
       }
       bhdr->count += i;
     }
-    setContext(&binCtx, oHdr, bhdr, sreqSize, context, cop);
+    setContext(&binCtx, oHdr, bhdr, sreqSize, context, cop, assocclass, resultclass);
 
     checkReroute(broker, context, oHdr);
 
@@ -575,7 +583,7 @@ getInstance(const CMPIBroker * broker,
     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));
@@ -674,7 +682,7 @@ createInstance(const CMPIBroker * broker,
 
     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));
@@ -771,7 +779,7 @@ modifyInstance(const CMPIBroker * broker,
     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));
@@ -848,7 +856,7 @@ deleteInstance(const CMPIBroker * broker,
 
     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));
@@ -920,7 +928,7 @@ execQuery(const CMPIBroker * broker,
 
     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));
@@ -1162,7 +1170,7 @@ invokeMethod(const CMPIBroker * broker, const CMPIContext *context,
 
     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);


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker