BUG#:5952

TITLE: CMPI has no backwards compatibility support for CIM:CQL

DESCRIPTION:

diff --git a/src/Pegasus/ProviderManager2/CMPI/CMPI_BrokerEnc.cpp b/src/Pegasus/ProviderManager2/CMPI/CMPI_BrokerEnc.cpp
index 22bc5407b6a2fe28cc51571ea34fc1990dada985..fb3a3074f9a05db96c547f45afbdc8c265ad3799 100644 (file)
--- a/src/Pegasus/ProviderManager2/CMPI/CMPI_BrokerEnc.cpp
+++ b/src/Pegasus/ProviderManager2/CMPI/CMPI_BrokerEnc.cpp
@@ -781,7 +781,9 @@ extern "C" {
         return (CMPISelectExp *) new CMPI_SelectExp (stmt);
       }
 #ifndef PEGASUS_DISABLE_CQL
-    if ((strncmp (lang, "CIMxCQL", CALL_SIGN_CQL_SIZE) == 0) || (strncmp (lang, CALL_SIGN_CQL, CALL_SIGN_CQL_SIZE) == 0))
+    if ((strncmp (lang, CALL_SIGN_CQL, CALL_SIGN_CQL_SIZE) == 0) ||
+        (strncmp (lang, "CIMxCQL", 7) == 0) ||
+        (strncmp (lang, "CIM:CQL", 7) == 0))
       {
         /* IBMKR: This will have to be removed when the CMPI spec is updated
            with a clear explanation of what properties array can have as

diff --git a/src/Pegasus/ProviderManager2/CMPI/CMPI_SelectExp.cpp b/src/Pegasus/ProviderManager2/CMPI/CMPI_SelectExp.cpp
index 61abcb23aa2895c25973421b62f9b8c882c6d3f0..03bf88bd497ff967826b91dd0495db5469d3cffc 100644 (file)
--- a/src/Pegasus/ProviderManager2/CMPI/CMPI_SelectExp.cpp
+++ b/src/Pegasus/ProviderManager2/CMPI/CMPI_SelectExp.cpp
@@ -206,8 +206,10 @@ extern "C"
       }
     /* CIM:CQL */
 #ifndef PEGASUS_DISABLE_CQL
-    if (strncmp (sx->lang.getCString (), CALL_SIGN_CQL, CALL_SIGN_CQL_SIZE) ==
-        0)
+    if ((strncmp (sx->lang.getCString(),
+                  CALL_SIGN_CQL, CALL_SIGN_CQL_SIZE) == 0) ||
+        (strncmp (sx->lang.getCString(),
+                  "CIM:CQL", 7) == 0))
       {
         if (_check_CQL (sx, rc))
           {
@@ -282,8 +284,10 @@ extern "C"
           return false;
       }
 #ifndef PEGASUS_DISABLE_CQL
-    if (strncmp (sx->lang.getCString (), CALL_SIGN_CQL, CALL_SIGN_CQL_SIZE) ==
-        0)
+    if ((strncmp (sx->lang.getCString(),
+                  CALL_SIGN_CQL, CALL_SIGN_CQL_SIZE) == 0) ||
+        (strncmp (sx->lang.getCString(),
+                  "CIM:CQL", 7) == 0))
       {
         if (_check_CQL (sx, rc))
           {
@@ -357,8 +361,10 @@ extern "C"
         sc = (CMPISelectCond *) new CMPI_SelectCond (sx->tableau, 0);
       }
 #ifndef PEGASUS_DISABLE_CQL
-    if (strncmp (sx->lang.getCString (), CALL_SIGN_CQL, CALL_SIGN_CQL_SIZE) ==
-        0)
+    if ((strncmp (sx->lang.getCString(),
+                  CALL_SIGN_CQL, CALL_SIGN_CQL_SIZE) == 0) ||
+        (strncmp (sx->lang.getCString(),
+                  "CIM:CQL", 7) == 0))
       {
         if (sx->cql_dnf == NULL)
           {