|
From: Chris B. <buc...@us...> - 2012-03-01 20:28:26
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv12175
Modified Files:
interopProvider.c ChangeLog NEWS
Log Message:
[ 3496061 ] IndicationSubscription May Be Undeletable
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -d -r1.647 -r1.648
--- NEWS 1 Mar 2012 17:47:19 -0000 1.647
+++ NEWS 1 Mar 2012 20:28:22 -0000 1.648
@@ -38,6 +38,7 @@
- 3495789 Makefile improvements for test suite
- 3495806 isChild() can cause a provider mismatch
- 3483200 duplicate indication deliveries
+- 3496061 IndicationSubscription May Be Undeletable
Changes in 1.3.13
=================
Index: interopProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopProvider.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- interopProvider.c 29 Feb 2012 22:46:06 -0000 1.52
+++ interopProvider.c 1 Mar 2012 20:28:22 -0000 1.53
@@ -687,11 +687,18 @@
enm = _broker->bft->enumerateInstances(_broker, ctxLocal, op, NULL, &st);
if(enm) {
+ CMPIStatus st;
while(enm->ft->hasNext(enm, &st) && (ci=(enm->ft->getNext(enm, &st)).value.inst)) {
CMPIObjectPath *hop;
cop=CMGetObjectPath(ci,&st);
hop=CMGetKey(cop,"handler",NULL).value.ref;
- processSubscription(broker,ctx,ci,cop);
+ st = processSubscription(broker,ctx,ci,cop);
+ /* if the on-disk repo is modified between startups, it is
+ possible for a subscription instance to exist w/o a filter or
+ handler. Clean out the useless sub if this is the case */
+ if (st.rc == CMPI_RC_ERR_NOT_FOUND) {
+ CBDeleteInstance(_broker, ctxLocal, cop);
+ }
}
CMRelease(enm);
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.724
retrieving revision 1.725
diff -u -d -r1.724 -r1.725
--- ChangeLog 1 Mar 2012 17:47:02 -0000 1.724
+++ ChangeLog 1 Mar 2012 20:28:22 -0000 1.725
@@ -1,3 +1,8 @@
+2012-03-01 Chris Buccella <buc...@li...>
+
+ * interopProvider.c:
+ [ 3496061 ] IndicationSubscription May Be Undeletable
+
2012-02-29 Narasimha Sharoff <nsh...@us...>
* brokerUpc.c
|