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

[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  6aad414a94a9aac8d3bc7494d9a36f5383674217 (commit)
       via  49498133ec7b75e1a5b8e8f72e54f2c45a152e65 (commit)
      from  f4af1a9c107500036415863845319d6bcd77d78f (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 6aad414a94a9aac8d3bc7494d9a36f5383674217
Merge: 49498133ec7b75e1a5b8e8f72e54f2c45a152e65 f4af1a9c107500036415863845319d6bcd77d78f
Author: buccella <buc...@li...>
Date:   Fri Apr 1 20:25:29 2011 -0400

    fixing merge

commit 49498133ec7b75e1a5b8e8f72e54f2c45a152e65
Author: buccella <buc...@li...>
Date:   Fri Apr 1 20:20:33 2011 -0400

    [ 3265502 ] CMPIContext not released in elementCapabilitiesProvider

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 56a4108..d5ea900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
+2011-04-01  Chris Buccella  <buc...@li...>
+
+	* elementCapabilitiesProvider.c:
+	[ 3265502 ] CMPIContext not released in elementCapabilitiesProvider
+
 2011-03-30 Michael Chase-Salerno <br...@li...>
+
 	* queryOperation.c
 	[ 3206663 ] Enum CQL filter on NULL cause segfault and incorrect rsp
 	(based on patch by  cpoblete)
diff --git a/NEWS b/NEWS
index f2bce31..2d4af80 100644
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,9 @@ New features:
 
 Bugs fixed: 
 
+Everything in 1.3.11, plus:
+
 - 3022940 Remove dead SLP code dealing with proc management
-- 3162016 sfcbd Segmentation fault in cleanupCimXmlRequest
 - 3175888 Remove JDBC support from SFCB 1.4.x
 - 3082573 Typo in interopProvider
 - 3177707 ExecQuery 1 to 4 tests segfault on power LPAR
@@ -69,6 +70,8 @@ Bugs fixed:
 - 3203290 Basic Auth Should Consider Expired Passwords
 - 3202420 CDATA value in a string property is improperly XML escaped
 - 3038078 Can create indication filters and destinations w/o key props
+- 3265502 CMPIContext not released in elementCapabilitiesProvider
+- 3162016 sfcbd Segmentation fault in cleanupCimXmlRequest
 
 Changes in 1.3.10
 =================
diff --git a/elementCapabilitiesProvider.c b/elementCapabilitiesProvider.c
index 40e8539..4964325 100644
--- a/elementCapabilitiesProvider.c
+++ b/elementCapabilitiesProvider.c
@@ -94,6 +94,7 @@ ElementCapabilitiesInitInstances(const CMPIContext *ctx)
   CMSetProperty(ci, "ManagedElement", &left, CMPI_ref);
   CMSetProperty(ci, "Capabilities", &right, CMPI_ref);
   CBCreateInstance(_broker, ctxLocal, op, ci, NULL);
+  CMRelease(ctxLocal);
   return;
 }
 
diff --git a/queryOperation.c b/queryOperation.c
index 2c04139..39f3162 100644
--- a/queryOperation.c
+++ b/queryOperation.c
@@ -230,14 +230,6 @@ charsCompare(QLOperand * self, QLOperand * op, QLPropertySource * src)
   else
     ov = op->charsVal;
 
-  if (sov == NULL || ov == NULL) {
-    if (sov == NULL && ov == NULL)
-       return 0; // both null
-    if (sov == NULL)
-        return -1; // left only null
-    return 1; // right only null
-  } 
-
   if (type == QL_Chars)
     return strcmp(sov, ov);
   return -2;
@@ -307,19 +299,7 @@ propCompare(QLOperand * self, QLOperand * op, QLPropertySource * src)
     ;                           // what should we do here ? 
   }
 
-  if (nop) {
-    rc=nop->ft->compare(nop,op,src);
-  } else {
-    rc=-2;
-    if ((type == QL_Null) && (op->type == QL_PropertyName)) {
-      // both are property names
-      v=getPropValue(op, src, &type);
-      if (type == QL_Null) {
-         rc=0; // both are NULL, a match
-      }
-    } 
-  }
-
+  rc = nop->ft->compare(nop, op, src);
   QL_TRACE(fprintf
            (stderr, "propCompare(%s) %d\n", self->propertyName->propName,
             rc));


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