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

[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  1fd3857ec1e63cf39fcc78857feb2affe92c99d5 (commit)
      from  c0cc2281e191aced430626ef18fd1819010e6c93 (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 1fd3857ec1e63cf39fcc78857feb2affe92c99d5
Author: buccella <buc...@li...>
Date:   Thu Feb 17 16:45:25 2011 -0500

    [ 3185178 ] Wrong classname for returned instances from execQuery

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 86a2ad5..d4c1465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-17  Chris Buccella  <buc...@li...>
+
+	* result.c, test/xmltest/execQuery.lines:
+	[ 3185178 ] Wrong classname for returned instances from execQuery
+
 2011-02-14 Narasimha Sharoff <nsh...@us...>
 
 	* cmpiTestExecQueryProvider.c
diff --git a/NEWS b/NEWS
index 5d3c734..da37c62 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,7 @@ Bugs fixed:
 - 3130727 CMPIPropertyMIFT.setProperty() missing objectpath keys
 - 3054618 mofpp is overaggressive when detecting comments
 - 3172080 deliverIndication does not check for matching FROM classes
+- 3185178 Wrong classname for returned instances from execQuery
 
 Changes in 1.3.10
 =================
diff --git a/result.c b/result.c
index baa0cd8..6521279 100644
--- a/result.c
+++ b/result.c
@@ -295,6 +295,7 @@ __rft_returnInstance(const CMPIResult *result,
   if (r->qs) {
     int             irc;
 
+    /* true for ExecQuery requests */
     if (r->qs->where) {
       r->qs->propSrc.data = (CMPIInstance *) instance;
       irc = r->qs->where->ft->evaluate(r->qs->where, &r->qs->propSrc);
@@ -302,7 +303,7 @@ __rft_returnInstance(const CMPIResult *result,
         if (r->qs->allProps == 0) {
           instance =
               r->qs->ft->cloneAndFilter(r->qs, (CMPIInstance *) instance,
-                                        r->qs->cop, r->qs->keys);
+                                        CMGetObjectPath(instance,NULL), r->qs->keys);
           releaseInstance = 1;
         }
       } else
@@ -311,7 +312,7 @@ __rft_returnInstance(const CMPIResult *result,
       if (r->qs->allProps == 0) {
         instance =
             r->qs->ft->cloneAndFilter(r->qs, (CMPIInstance *) instance,
-                                      r->qs->cop, r->qs->keys);
+                                      CMGetObjectPath(instance,NULL), r->qs->keys);
         releaseInstance = 1;
       }
     }
diff --git a/test/xmltest/execQuery.lines b/test/xmltest/execQuery.lines
index 296c037..81e8bd6 100644
--- a/test/xmltest/execQuery.lines
+++ b/test/xmltest/execQuery.lines
@@ -4,7 +4,7 @@
 <SIMPLERSP>
 <IMETHODRESPONSE NAME="ExecQuery">
 <IRETURNVALUE>
-<INSTANCE CLASSNAME="CIM_ComputerSystem">
+<INSTANCE CLASSNAME="Linux_ComputerSystem">
 <PROPERTY NAME="NameFormat" TYPE="string">
 <VALUE>IP</VALUE>
 </PROPERTY>


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