[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-404-g380537d

[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  380537de398cf5fe9467429444b3801008a06a13 (commit)
      from  b31b7daf35493309b6a96e5c034ed772b71be4ab (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 380537de398cf5fe9467429444b3801008a06a13
Author: buccella <buc...@li...>
Date:   Wed Mar 6 14:55:54 2013 -0500

    [sfcb-tix:#25] classProviderSf drops Association qualifier on child classes

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

Summary of changes:
 classProviderSf.c                                  |    6 +++---
 test/TestProviders/tests/IndTest41References.lines |    1 +
 test/TestProviders/tests/IndTest41References.xml   |    7 +++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/classProviderSf.c b/classProviderSf.c
index 1155078..404a860 100644
--- a/classProviderSf.c
+++ b/classProviderSf.c
@@ -749,10 +749,10 @@ getResolvedClass(ClassRegister * cr, const char *clsName,
     char orig_abst = mc->quals & ClClass_Q_Abstract;
 
     mergeParents(cr, mc, pn, cls, rctl);
-
     /* We want all our parents' qualifiers except for Abstract. 
-       Overwrite using original Abstract bit */
-    mc->quals &= orig_abst;
+       Clear and set using original Abstract bit */
+    mc->quals &= ~ClClass_Q_Abstract;
+    mc->quals |= orig_abst;
 
     if (*rctl == tempRead) {
       if (cls && (cls_ctl != cached))
diff --git a/test/TestProviders/tests/IndTest41References.lines b/test/TestProviders/tests/IndTest41References.lines
new file mode 100644
index 0000000..7805ef5
--- /dev/null
+++ b/test/TestProviders/tests/IndTest41References.lines
@@ -0,0 +1 @@
+<INSTANCENAME CLASSNAME="CIM_IndicationSubscription">
diff --git a/test/TestProviders/tests/IndTest41References.xml b/test/TestProviders/tests/IndTest41References.xml
new file mode 100644
index 0000000..b0822ee
--- /dev/null
+++ b/test/TestProviders/tests/IndTest41References.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="ReferenceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH>
+<IPARAMVALUE NAME="ObjectName"><INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML"><KEYBINDING NAME="creationclassname"><KEYVALUE VALUETYPE="string">CIM_IndicationHandlerCIMXML</KEYVALUE></KEYBINDING><KEYBINDING NAME="name"><KEYVALUE VALUETYPE="string">Test_Indication_Handler_</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemcreationclassname"><KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemname"><KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE></KEYBINDING></INSTANCENAME></IPARAMVALUE>
+<IPARAMVALUE NAME="ResultClass"><CLASSNAME NAME="CIM_IndicationSubscription"/></IPARAMVALUE>
+</IMETHODCALL></SIMPLEREQ>
+</MESSAGE></CIM>


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