Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Dave B. <bla...@us...> - 2012-04-13 15:06:35
|
Update of /cvsroot/sblim/jsr48-client/src/javax/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv24076/src/javax/cim
Modified Files:
Tag: Experimental
CIMDataType.java
Log Message:
3517503 - Missing parm in CIMDataType ctor javadoc
Index: CIMDataType.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMDataType.java,v
retrieving revision 1.5.2.14
retrieving revision 1.5.2.15
diff -u -d -r1.5.2.14 -r1.5.2.15
--- CIMDataType.java 31 Mar 2012 15:39:42 -0000 1.5.2.14
+++ CIMDataType.java 13 Apr 2012 15:06:32 -0000 1.5.2.15
@@ -23,6 +23,7 @@
* 3004779 2010-06-16 blaschke-oss TCK: CIMDataType not throwing IllegalArgumentException
* 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1
* 3513349 2012-03-31 blaschke-oss TCK: CIMDataType must not accept null string
+ * 3517503 2012-04-13 blaschke-oss Missing parm in CIMDataType ctor javadoc
*/
package javax.cim;
@@ -512,6 +513,9 @@
*
* @param pType
* The data type as defined in the CIM class.
+ * @param pIsArray
+ * <code>true</code> if data type is unbounded array,
+ * <code>false</code> if data type is scalar.
* @throws IllegalArgumentException
*/
private CIMDataType(int pType, boolean pIsArray) throws IllegalArgumentException {
|
|
From: Dave B. <bla...@us...> - 2012-04-13 13:58:30
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv17534/src/org/sblim/cimclient/internal/cim
Modified Files:
CIMHelper.java
Log Message:
3513353 - TCK: CIMDataType arrays must have length >= 1
Index: CIMHelper.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cim/CIMHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CIMHelper.java 13 Apr 2012 13:47:35 -0000 1.7
+++ CIMHelper.java 13 Apr 2012 13:58:27 -0000 1.8
@@ -98,7 +98,7 @@
/* 11 */CIMDataType.REAL64_T,
/* 12 */CIMDataType.DATETIME_T,
/* 13 */CIMDataType.CHAR16_T,
- /* 14 */new CIMDataType(""),
+ /* 14 */new CIMDataType(null),
/* 15 */CIMDataType.OBJECT_T,
/* 16 */null,
/* 17 */CIMDataType.CLASS_T };
|
|
From: Dave B. <bla...@us...> - 2012-04-13 13:47:37
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node
In directory vz-cvs-3.sog:/tmp/cvs-serv15775/src/org/sblim/cimclient/internal/cimxml/sax/node
Modified Files:
Node.java QualiDeclNode.java QualifierNode.java
ValueArrayNode.java
Log Message:
3513353 - TCK: CIMDataType arrays must have length >= 1
Index: Node.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/Node.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Node.java 10 Mar 2009 17:05:32 -0000 1.11
+++ Node.java 13 Apr 2012 13:47:34 -0000 1.12
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -21,7 +21,8 @@
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2038305 2008-08-14 blaschke-oss SAXException SBLIM Java Client V2.0.7
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -29,6 +30,7 @@
import javax.cim.CIMDataType;
import javax.cim.CIMFlavor;
+import org.sblim.cimclient.internal.cim.CIMHelper;
import org.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
import org.sblim.cimclient.internal.cimxml.sax.NodeConstIf;
import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
@@ -248,7 +250,10 @@
boolean isArray = hasTrueAttribute(pAttribs, "ISARRAY");
String arraySizeStr = pAttribs.getValue("ARRAYSIZE");
int arraySize = (arraySizeStr == null ? (isArray ? 0 : -1) : Integer.parseInt(arraySizeStr));
- if (isArray || arraySize >= 0) { return new CIMDataType(type.getType(), arraySize); }
+ if (isArray || arraySize >= 0) {
+ if (arraySize > 0) return new CIMDataType(type.getType(), arraySize);
+ return CIMHelper.UnboundedArrayDataType(type.getType());
+ }
return type;
}
Index: QualiDeclNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- QualiDeclNode.java 13 Apr 2012 12:59:50 -0000 1.9
+++ QualiDeclNode.java 13 Apr 2012 13:47:34 -0000 1.10
@@ -22,6 +22,7 @@
* 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
+ * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -30,6 +31,7 @@
import javax.cim.CIMObjectPath;
import javax.cim.CIMQualifierType;
+import org.sblim.cimclient.internal.cim.CIMHelper;
import org.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
import org.xml.sax.Attributes;
@@ -155,7 +157,8 @@
setType(valAChild);
this.iValue = CIMObjectFactory.getObject(this.iType, valAChild);
// making array type
- if (!this.iType.isArray()) this.iType = new CIMDataType(this.iType.getType(), 0);
+ if (!this.iType.isArray()) this.iType = CIMHelper.UnboundedArrayDataType(this.iType
+ .getType());
} else if (pChild instanceof ValueNode) {
ValueNode valChild = (ValueNode) pChild;
setType(valChild);
Index: ValueArrayNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ValueArrayNode.java 10 Mar 2009 17:05:32 -0000 1.9
+++ ValueArrayNode.java 13 Apr 2012 13:47:34 -0000 1.10
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,7 +20,8 @@
* 1735693 2007-06-12 ebak Empty VALUE.ARRAY elements are parsed as nulls
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -30,6 +31,7 @@
import javax.cim.CIMDataType;
import org.sblim.cimclient.GenericExts;
+import org.sblim.cimclient.internal.cim.CIMHelper;
import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -65,7 +67,8 @@
CIMDataType scalarType = getCIMType(pAttribs, true);
if (scalarType == null) scalarType = getParamType(pAttribs);
// make array type
- this.iType = scalarType == null ? null : new CIMDataType(scalarType.getType(), 0);
+ this.iType = scalarType == null ? null : CIMHelper.UnboundedArrayDataType(scalarType
+ .getType());
}
/**
Index: QualifierNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- QualifierNode.java 12 Jun 2009 02:33:23 -0000 1.12
+++ QualifierNode.java 13 Apr 2012 13:47:34 -0000 1.13
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -22,8 +22,9 @@
* 2013628 2008-07-30 rgummada SAXException when listing classes
* 2204488 2008-10-28 raman_arora Fix code to remove compiler warnings
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -31,6 +32,7 @@
import javax.cim.CIMDataType;
import javax.cim.CIMQualifier;
+import org.sblim.cimclient.internal.cim.CIMHelper;
import org.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
import org.xml.sax.Attributes;
@@ -111,7 +113,8 @@
// create array value
value = CIMObjectFactory.getObject(this.iType, valANode);
// constructs array type
- type = this.iType.isArray() ? this.iType : new CIMDataType(this.iType.getType(), 0);
+ type = this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
+ .getType());
} else if (absValNode instanceof ValueNode) {
ValueNode valNode = (ValueNode) absValNode;
setType(valNode);
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node
In directory vz-cvs-3.sog:/tmp/cvs-serv11339/src/org/sblim/cimclient/internal/cimxml/sax/node
Modified Files:
ValueReferenceNode.java QualifiedNodeHandler.java
QualiDeclNode.java MessageNode.java MultiRspNode.java
MultiReqNode.java IReturnValueNode.java SimpleExpReqNode.java
MultiExpReqNode.java IMethodResponseNode.java
SimpleReqNode.java ExpParamValueNode.java ClassPathNode.java
ExpMethodCallNode.java CIMNode.java
AbstractMethodCallNode.java ValueRefArrayNode.java
MethodResponseNode.java ExpMethodResponseNode.java
NameSpacePathNode.java InstancePathNode.java
ValueObjectWithLocalPathNode.java LocalInstancePathNode.java
SimpleExpRspNode.java ValueObjectWithPathNode.java
MultiExpRspNode.java SimpleRspNode.java
Log Message:
3511454 - SAX nodes not reinitialized properly
Index: SimpleExpRspNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SimpleExpRspNode.java 12 Jun 2009 02:33:23 -0000 1.7
+++ SimpleExpRspNode.java 13 Apr 2012 12:59:51 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -19,6 +19,7 @@
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -57,7 +58,8 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- // no attribs
+ this.iExpMethodRspNode = null;
+ // no attribs
}
/**
@@ -101,7 +103,7 @@
}
public Object readReturnValue() {
- return this.iExpMethodRspNode.readReturnValue();
+ return this.iExpMethodRspNode == null ? null : this.iExpMethodRspNode.readReturnValue();
}
}
Index: ValueRefArrayNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ValueRefArrayNode.java 27 Apr 2009 15:04:59 -0000 1.8
+++ ValueRefArrayNode.java 13 Apr 2012 12:59:51 -0000 1.9
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,6 +20,7 @@
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -29,6 +30,7 @@
import javax.cim.CIMDataType;
import javax.cim.CIMObjectPath;
+import org.sblim.cimclient.GenericExts;
import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -53,8 +55,7 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- if (this.iCIMObjPathAL != null) this.iCIMObjPathAL.clear();
- else this.iCIMObjPathAL = null;
+ this.iCIMObjPathAL = GenericExts.initClearArrayList(this.iCIMObjPathAL);
// no attributes
}
@@ -88,7 +89,7 @@
* @return CIMObjectPath
*/
public Object elementAt(int pIdx) {
- return this.iCIMObjPathAL.get(pIdx);
+ return this.iCIMObjPathAL == null ? null : this.iCIMObjPathAL.get(pIdx);
}
public int size() {
Index: IReturnValueNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- IReturnValueNode.java 14 Sep 2009 15:47:09 -0000 1.8
+++ IReturnValueNode.java 13 Apr 2012 12:59:50 -0000 1.9
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,8 +18,9 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2845211 2009-08-27 raman_arora Pull Enumeration Feature (SAX Parser)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -67,6 +68,7 @@
// currently it's not really necessary here, since the Node is
// NonVolatile
this.iChildNameEnum = null;
+ this.iChildValueLL = null;
// no attribs
}
@@ -127,7 +129,7 @@
}
public Object readReturnValue() {
- return this.iChildValueLL.removeFirst();
+ return this.iChildValueLL == null ? null : this.iChildValueLL.removeFirst();
}
}
Index: ExpMethodResponseNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ExpMethodResponseNode.java 28 Apr 2009 19:42:45 -0000 1.7
+++ ExpMethodResponseNode.java 13 Apr 2012 12:59:51 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -19,6 +19,7 @@
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -61,6 +62,8 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
this.iName = getCIMName(pAttribs);
+ this.iErrorNode = null;
+ this.iRetValNode = null;
}
/**
@@ -99,7 +102,7 @@
}
public CIMError getCIMError() {
- return this.iErrorNode.getCIMError();
+ return this.iErrorNode == null ? null : this.iErrorNode.getCIMError();
}
public int getReturnValueCount() {
Index: ValueObjectWithLocalPathNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ValueObjectWithLocalPathNode.java 10 Mar 2009 17:05:32 -0000 1.7
+++ ValueObjectWithLocalPathNode.java 13 Apr 2012 12:59:51 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,7 +18,8 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -62,6 +63,8 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
this.iPathNodeNameEnum = this.iObjNodeNameEnum = null;
+ this.iObjPath = null;
+ this.iCIMObj = null;
// no attributes
}
Index: ClassPathNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ClassPathNode.java 10 Mar 2009 17:05:32 -0000 1.8
+++ ClassPathNode.java 13 Apr 2012 12:59:51 -0000 1.9
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -19,6 +19,7 @@
* 1742873 2007-06-25 ebak IPv6 ready cim-client
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -40,7 +41,7 @@
private String iLocalNameSpacePathStr;
- private XMLHostStr iHostStr = new XMLHostStr();
+ private XMLHostStr iHostStr;
private String iClassNameStr;
@@ -60,6 +61,7 @@
// reset
this.iHasNameSpacePath = this.iHasClassName = false;
this.iLocalNameSpacePathStr = this.iClassNameStr = null;
+ this.iHostStr = new XMLHostStr();
}
/**
Index: QualifiedNodeHandler.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- QualifiedNodeHandler.java 15 Mar 2010 11:28:22 -0000 1.11
+++ QualifiedNodeHandler.java 13 Apr 2012 12:59:50 -0000 1.12
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,10 +20,11 @@
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2013628 2008-07-30 rgummada SAXException when listing classes
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2823494 2009-08-03 rgummada Change Boolean constructor to static
* 2957387 2010-03-03 blaschke-oss EmbededObject XML attribute must not be all uppercases
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -33,6 +34,7 @@
import javax.cim.CIMDataType;
import javax.cim.CIMQualifier;
+import org.sblim.cimclient.GenericExts;
import org.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
/**
@@ -69,11 +71,7 @@
* init - for reusing an existing QualifiedNodeHandler instance
*/
public void init() {
- if (this.iQualiAL != null) {
- this.iQualiAL.clear();
- } else {
- this.iQualiAL = new ArrayList<CIMQualifier<?>>();
- }
+ this.iQualiAL = GenericExts.initClearArrayList(this.iQualiAL);
this.iHasEmbObjQuali = this.iHasEmbInstQuali = this.iHasKeyQuali = this.iHasAssocQuali = false;
this.iQualiImpl = null;
}
Index: SimpleReqNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SimpleReqNode.java 10 Mar 2009 17:05:32 -0000 1.7
+++ SimpleReqNode.java 13 Apr 2012 12:59:51 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -19,6 +19,7 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -51,7 +52,8 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- // no attributes
+ this.iMethodCallNode = null;
+ // no attributes
}
/**
Index: CIMNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CIMNode.java 10 Mar 2009 17:05:32 -0000 1.6
+++ CIMNode.java 13 Apr 2012 12:59:51 -0000 1.7
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,6 +18,7 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -60,7 +61,7 @@
if (this.iCimVersion == null) { throw new SAXException("CIMVERSION attribute is mandatory!"); }
this.iDtdVersion = pAttribs.getValue("DTDVERSION");
if (this.iDtdVersion == null) { throw new SAXException("DTDVERSION attribute is mandatory!"); }
-
+ this.iContent = null;
}
/**
Index: LocalInstancePathNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- LocalInstancePathNode.java 12 Jun 2009 02:33:23 -0000 1.8
+++ LocalInstancePathNode.java 13 Apr 2012 12:59:51 -0000 1.9
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,8 +18,9 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -66,6 +67,8 @@
public void init(Attributes pAttribs, SAXSession pSession) {
this.iLocalPath = pSession.getDefLocalPath();
this.iHasLocalNameSpacePath = this.iHasInstanceName = false;
+ this.iNameSpaceStr = this.iClassNameStr = null;
+ this.iKeys = null;
// no attributes
}
Index: NameSpacePathNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- NameSpacePathNode.java 10 Mar 2009 17:05:32 -0000 1.9
+++ NameSpacePathNode.java 13 Apr 2012 12:59:51 -0000 1.10
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -19,7 +19,8 @@
* 1742873 2007-06-25 ebak IPv6 ready cim-client
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -57,6 +58,7 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
this.iHasHost = this.iHasLocalNameSpacePath = false;
+ this.iHostStr = this.iLocalNameSpacePathStr = null;
// no attributes
}
Index: IMethodResponseNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- IMethodResponseNode.java 14 Sep 2009 15:47:09 -0000 1.8
+++ IMethodResponseNode.java 13 Apr 2012 12:59:51 -0000 1.9
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,6 +20,7 @@
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors
* 2845211 2009-08-27 raman_arora Pull Enumeration Feature (SAX Parser)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -77,6 +78,9 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
this.iName = getCIMName(pAttribs);
+ this.iErrorNode = null;
+ this.iRetValNode = null;
+ if (this.iCIMArgAL != null) this.iCIMArgAL.clear();
}
/**
Index: MultiExpRspNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MultiExpRspNode.java 28 Apr 2009 19:42:45 -0000 1.8
+++ MultiExpRspNode.java 13 Apr 2012 12:59:51 -0000 1.9
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,6 +20,7 @@
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -55,7 +56,8 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- // no attributes
+ if (this.iSimpleExpRspAList != null) this.iSimpleExpRspAList.clear();
+ // no attributes
}
/**
Index: MessageNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MessageNode.java 10 Mar 2009 17:05:32 -0000 1.6
+++ MessageNode.java 13 Apr 2012 12:59:50 -0000 1.7
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,6 +18,7 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -64,6 +65,7 @@
this.iProtocolVersion = pAttribs.getValue("PROTOCOLVERSION");
if (this.iProtocolVersion == null) throw new SAXException(
"PROTOCOLVERSION attribute is mandatory for MESSAGE node!");
+ this.iAbstractMsgNode = null;
}
/**
Index: ValueObjectWithPathNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ValueObjectWithPathNode.java 29 Jul 2010 18:51:56 -0000 1.7
+++ ValueObjectWithPathNode.java 13 Apr 2012 12:59:51 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,7 +18,8 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -61,6 +62,8 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
this.iPathNodeNameEnum = this.iObjNodeNameEnum = null;
+ this.iObjPath = null;
+ this.iCIMObj = null;
// no attributes
}
Index: MultiRspNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MultiRspNode.java 10 Mar 2009 17:05:32 -0000 1.7
+++ MultiRspNode.java 13 Apr 2012 12:59:50 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,7 +18,8 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -54,7 +55,8 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- // no attribs
+ if (this.iSimpleRspAList != null) this.iSimpleRspAList.clear();
+ // no attribs
}
/**
Index: MultiReqNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MultiReqNode.java 10 Mar 2009 17:05:32 -0000 1.7
+++ MultiReqNode.java 13 Apr 2012 12:59:50 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,7 +18,8 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -54,7 +55,8 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- // no attributes
+ if (this.iSimpleReqAList != null) this.iSimpleReqAList.clear();
+ // no attributes
}
/**
Index: ExpParamValueNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ExpParamValueNode.java 10 Mar 2009 17:05:32 -0000 1.6
+++ ExpParamValueNode.java 13 Apr 2012 12:59:51 -0000 1.7
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,6 +18,7 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -56,6 +57,7 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
this.iName = getCIMName(pAttribs);
+ this.iChildNode = null;
}
/**
Index: SimpleExpReqNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SimpleExpReqNode.java 10 Mar 2009 17:05:32 -0000 1.6
+++ SimpleExpReqNode.java 13 Apr 2012 12:59:50 -0000 1.7
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,6 +18,7 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -50,7 +51,8 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- // no attributes
+ this.iMethodCallNode = null;
+ // no attributes
}
/**
Index: MultiExpReqNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MultiExpReqNode.java 10 Mar 2009 17:05:32 -0000 1.7
+++ MultiExpReqNode.java 13 Apr 2012 12:59:51 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,7 +18,8 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -54,7 +55,8 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- // no attributes
+ if (this.iSimpleExpReqAList != null) this.iSimpleExpReqAList.clear();
+ // no attributes
}
/**
Index: AbstractMethodCallNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- AbstractMethodCallNode.java 12 Jun 2009 02:33:23 -0000 1.9
+++ AbstractMethodCallNode.java 13 Apr 2012 12:59:51 -0000 1.10
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -19,7 +19,8 @@
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
- * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -78,6 +79,10 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
this.iName = getCIMName(pAttribs);
+ this.iPath = null;
+ this.iRespDstNode = null;
+ this.iArgAL = null;
+ this.iArgA = null;
}
/**
@@ -179,7 +184,7 @@
*/
public CIMArgument<?> getArgument(int pIdx) {
getCIMArguments();
- return this.iArgA[pIdx];
+ return this.iArgA == null ? null : this.iArgA[pIdx];
}
@Override
Index: SimpleRspNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- SimpleRspNode.java 14 Sep 2009 15:47:09 -0000 1.9
+++ SimpleRspNode.java 13 Apr 2012 12:59:51 -0000 1.10
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,6 +20,7 @@
* 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2845211 2009-08-27 raman_arora Pull Enumeration Feature (SAX Parser)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -60,7 +61,8 @@
*/
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
- // no attributes
+ this.iChildNode = null;
+ // no attributes
}
/**
Index: InstancePathNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- InstancePathNode.java 12 Jun 2009 02:33:23 -0000 1.9
+++ InstancePathNode.java 13 Apr 2012 12:59:51 -0000 1.10
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,6 +20,7 @@
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -42,7 +43,7 @@
private String iLocalNameSpacePathStr;
- private XMLHostStr iHostStr = new XMLHostStr();
+ private XMLHostStr iHostStr;
// INSTANCENAME
private boolean iHasInstanceName;
@@ -65,6 +66,9 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) {
this.iHasInstanceName = this.iHasInstancePath = false;
+ this.iLocalNameSpacePathStr = this.iClassNameStr = null;
+ this.iHostStr = new XMLHostStr();
+ this.iKeys = null;
}
@Override
Index: QualiDeclNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- QualiDeclNode.java 12 Jun 2009 02:33:23 -0000 1.8
+++ QualiDeclNode.java 13 Apr 2012 12:59:50 -0000 1.9
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -19,8 +19,9 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -100,7 +101,9 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
this.iHasScope = false;
+ this.iScope = 0;
this.iValueNodeName = null;
+ this.iValue = null;
this.iName = getCIMName(pAttribs);
this.iType = getCIMType(pAttribs, true);
this.iFlavor = getQualifierFlavor(pAttribs);
Index: ValueReferenceNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ValueReferenceNode.java 10 Mar 2009 17:05:32 -0000 1.7
+++ ValueReferenceNode.java 13 Apr 2012 12:59:50 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,7 +18,8 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -97,7 +98,7 @@
}
public CIMDataType getType() {
- return new CIMDataType(this.iCIMObjPath.getObjectName());
+ return this.iCIMObjPath == null ? null : new CIMDataType(this.iCIMObjPath.getObjectName());
}
public CIMObjectPath getCIMObjectPath() {
Index: ExpMethodCallNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ExpMethodCallNode.java 10 Mar 2009 17:05:32 -0000 1.7
+++ ExpMethodCallNode.java 13 Apr 2012 12:59:51 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,7 +18,8 @@
* 1720707 2007-05-17 ebak Conventional Node factory for CIM-XML SAX parser
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -64,6 +65,7 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
this.iName = getCIMName(pAttribs);
+ if (this.iExpParamValNodeAList != null) this.iExpParamValNodeAList.clear();
}
/**
Index: MethodResponseNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MethodResponseNode.java 14 Sep 2009 15:47:09 -0000 1.10
+++ MethodResponseNode.java 13 Apr 2012 12:59:51 -0000 1.11
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -22,6 +22,7 @@
* 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2845211 2009-08-27 raman_arora Pull Enumeration Feature (SAX Parser)
+ * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly
*/
package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -72,6 +73,9 @@
@Override
public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
this.iName = getCIMName(pAttribs);
+ this.iError = null;
+ this.iRetVal = null;
+ if (this.iCIMArgAL != null) this.iCIMArgAL.clear();
}
/**
|
|
From: Dave B. <bla...@us...> - 2012-04-13 12:59:54
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv11339 Modified Files: NEWS Log Message: 3511454 - SAX nodes not reinitialized properly Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.277 retrieving revision 1.278 diff -u -d -r1.277 -r1.278 --- NEWS 13 Apr 2012 12:19:15 -0000 1.277 +++ NEWS 13 Apr 2012 12:59:52 -0000 1.278 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3511454 SAX nodes not reinitialized properly 3510090 Fix CIMObjectPath.toString() inconsistencies 3510321 Handle CDATA in CimXmlSerializer 3505681 Add detailed release history HTML |
|
From: Dave B. <bla...@us...> - 2012-04-13 12:19:17
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv7531/utst/org/sblim/cimclient/unittest/cim
Modified Files:
CIMObjectPathTest.java
Log Message:
3510090 - Fix CIMObjectPath.toString() inconsistencies
Index: CIMObjectPathTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim/CIMObjectPathTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CIMObjectPathTest.java 14 Mar 2012 10:58:12 -0000 1.15
+++ CIMObjectPathTest.java 13 Apr 2012 12:19:14 -0000 1.16
@@ -25,6 +25,7 @@
* 2944824 2010-02-08 blaschke-oss Missing getXmlSchemaName() in CIMObjectPath
* 3374012 2011-07-24 blaschke-oss Sblim client CIMObjectPath class defect for LLA format URL
* 3496349 2012-03-02 blaschke-oss JSR48 1.0.0: add CIMObjectPath getKeyValue
+ * 3510090 2012-03-23 blaschke-oss Fix CIMObjectPath.toString() inconsistencies
*/
package org.sblim.cimclient.unittest.cim;
@@ -139,6 +140,86 @@
verify("XmlSchemaName differs", xmlSchemaName.equals(cop.getXmlSchemaName()));
}
+ // These COPs are examples from DSP0004, DSP0207, etc. with slight
+ // modifications to match the client's functionality, i.e. true instead of
+ // True, 42 instead of 0x2A, 'A' instead of '\x41', sorted keys, etc.
+ //
+ // NOTE: UNTYPEDPATH_A AND TYPEDPATH_A ENTRIES MUST MATCH UP!!! In other
+ // words, they must be identical except for presence/absence of typing.
+ private static final String[] UNTYPEDPATH_A = {
+ "http://myserver.acme.com/root/cimv2:ACME_LogicalDisk.Drive=\"C\",SystemName=\"acme\"",
+ "//myserver.acme.com:5988/root/cimv2:ACME_BooleanKeyClass.KeyProp=true",
+ "/root/cimv2:ACME_IntegerKeyClass.KeyProp=42",
+ "ACME_CharKeyClass.KeyProp='A'",
+ "http://myserver.org:5066/root/cimv2:My_ComputerSystem.CreationClassName=\"My_ComputerSystem\",Name=\"mycmp\"",
+ "http://myserver.org/root/cimv2:My_ComputerSystem.CreationClassName=\"My_ComputerSystem\",Name=\"mycmp\"",
+ "//myserver.org/root/cimv2:My_ComputerSystem", "/root/cimv2:My_ComputerSystem",
+ "//www.acme.com/root/cimv2", "//www.acme.com/root/cimv2:CIM_RegisteredProfile",
+ "https://jdd:te...@ac...:5959/cimv2:CIM_RegisteredProfile",
+ "https://jdd:te...@ac...:5959/cimv2:CIM_RegisteredProfile.InstanceID=\"acme:1\"" };
+
+ private static final String[] TYPEDPATH_A = {
+ "http://myserver.acme.com/root/cimv2/(instance)ACME_LogicalDisk.Drive=(string)\"C\",SystemName=(string)\"acme\"",
+ "//myserver.acme.com:5988/root/cimv2/(instance)ACME_BooleanKeyClass.KeyProp=(boolean)true",
+ "/root/cimv2/(instance)ACME_IntegerKeyClass.KeyProp=(uint8)42",
+ "/(instance)ACME_CharKeyClass.KeyProp=(char16)'A'",
+ "http://myserver.org:5066/root/cimv2/(instance)My_ComputerSystem.CreationClassName=(string)\"My_ComputerSystem\",Name=(string)\"mycmp\"",
+ "http://myserver.org/root/cimv2/(instance)My_ComputerSystem.CreationClassName=(string)\"My_ComputerSystem\",Name=(string)\"mycmp\"",
+ "//myserver.org/root/cimv2/(class)My_ComputerSystem",
+ "/root/cimv2/(class)My_ComputerSystem",
+ "//www.acme.com/root/cimv2/(namespace)",
+ "//www.acme.com/root/cimv2/(class)CIM_RegisteredProfile",
+ "https://jdd:te...@ac...:5959/cimv2/(class)CIM_RegisteredProfile",
+ "https://jdd:te...@ac...:5959/cimv2/(instance)CIM_RegisteredProfile.InstanceID=(string)\"acme:1\"" };
+
+ /**
+ * Tests the toString method and MOF.objectHandle to make sure that what
+ * goes in matches what comes out.
+ */
+ public void testObjectPaths() {
+ String inStr, outStr;
+ CIMObjectPath cop;
+
+ verify("Untyped/typed arrays differ in size", UNTYPEDPATH_A.length == TYPEDPATH_A.length);
+
+ for (int i = 0; i < UNTYPEDPATH_A.length; i++) {
+ inStr = UNTYPEDPATH_A[i];
+ cop = new CIMObjectPath(inStr);
+ outStr = MOF.objectHandle(cop, false, false);
+ verify("Untyped in/out differs: " + inStr + " != " + outStr, inStr.equals(outStr));
+ }
+
+ for (int i = 0; i < TYPEDPATH_A.length; i++) {
+ inStr = TYPEDPATH_A[i];
+ cop = new CIMObjectPath(inStr);
+ outStr = MOF.objectHandle(cop, true, false);
+ verify("Typed in/out differs: " + inStr + " != " + outStr, inStr.equals(outStr));
+ }
+
+ for (int i = 0; i < UNTYPEDPATH_A.length; i++) {
+ inStr = UNTYPEDPATH_A[i];
+ cop = new CIMObjectPath(inStr);
+ outStr = MOF.objectHandle(cop, true, false);
+ verify("Untyped in/typed out differs: " + inStr + " != " + outStr, TYPEDPATH_A[i]
+ .equals(outStr));
+ }
+
+ for (int i = 0; i < TYPEDPATH_A.length; i++) {
+ inStr = TYPEDPATH_A[i];
+ cop = new CIMObjectPath(inStr);
+ outStr = MOF.objectHandle(cop, false, false);
+ verify("Typed in/untyped out differs: " + inStr + " != " + outStr, UNTYPEDPATH_A[i]
+ .equals(outStr));
+ }
+
+ for (int i = 0; i < UNTYPEDPATH_A.length; i++) {
+ inStr = UNTYPEDPATH_A[i];
+ cop = new CIMObjectPath(inStr);
+ outStr = cop.toString();
+ verify("Untyped in/toString differs: " + inStr + " != " + outStr, inStr.equals(outStr));
+ }
+ }
+
private CIMProperty<String> createProperty1a() {
return new CIMProperty<String>("Name", CIMDataType.STRING_T, "A name", true, true,
"MyClass");
|
|
From: Dave B. <bla...@us...> - 2012-04-13 11:55:45
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv5234 Modified Files: NEWS Log Message: 3510321 - Handle CDATA in CimXmlSerializer Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.275 retrieving revision 1.276 diff -u -d -r1.275 -r1.276 --- NEWS 2 Apr 2012 20:59:10 -0000 1.275 +++ NEWS 13 Apr 2012 11:55:42 -0000 1.276 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3510321 Handle CDATA in CimXmlSerializer 3505681 Add detailed release history HTML 3500619 JSR48 1.0.0: CIMClass association/key clean up |
|
From: Chris B. <buc...@us...> - 2012-04-11 22:55:19
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv32333
Modified Files:
ChangeLog NEWS httpAdapter.c sfcBroker.c httpComm.c
providerDrv.c providerMgr.c sfcb.cfg.pre.in trace.c trace.h
Log Message:
[ 3501314 ] Add dynamic logging and syslog output to sfcb trace
Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- providerDrv.c 30 Mar 2012 23:43:05 -0000 1.115
+++ providerDrv.c 11 Apr 2012 22:55:17 -0000 1.116
@@ -64,7 +64,7 @@
struct timeval sv,ev;
#define TIMING_START(req,pInfo) \
- if (pInfo && req->sessionId && (_sfcb_trace_mask & TRACE_RESPONSETIMING) ) {\
+ if (pInfo && req->sessionId && (*_ptr_sfcb_trace_mask & TRACE_RESPONSETIMING) ) {\
gettimeofday(&sv,NULL);\
getrusage(RUSAGE_SELF,&us);\
getrusage(RUSAGE_CHILDREN,&cs);\
@@ -72,7 +72,7 @@
}
#define TIMING_STOP(req,pInfo) \
- if (uset && (_sfcb_trace_mask & TRACE_RESPONSETIMING) ) { \
+ if (uset && (*_ptr_sfcb_trace_mask & TRACE_RESPONSETIMING) ) { \
gettimeofday(&ev,NULL); \
getrusage(RUSAGE_SELF,&ue); \
getrusage(RUSAGE_CHILDREN,&ce); \
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.758
retrieving revision 1.759
diff -u -d -r1.758 -r1.759
--- ChangeLog 10 Apr 2012 15:49:56 -0000 1.758
+++ ChangeLog 11 Apr 2012 22:55:17 -0000 1.759
@@ -1,3 +1,11 @@
+2012-04-11 Chris Buccella <buc...@li...>
+
+ * Makefile.am, cimXmlRequest.c, httpAdapter.c, httpComm.c,
+ providerDrv.c, providerMgr.c, sfcBroker.c, sfcb.cfg.pre.in,
+ trace.c, trace.h:
+ [ 3501314 ] Add dynamic logging and syslog output to sfcb trace
+ (based on patch from Mike Lisanke)
+
2012-04-10 Chris Buccella <buc...@li...>
* cimXmlRequest.c, control.c, httpAdapter.c, sfcb.cfg.pre.in:
Index: sfcBroker.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcBroker.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- sfcBroker.c 5 Mar 2012 19:12:09 -0000 1.62
+++ sfcBroker.c 11 Apr 2012 22:55:17 -0000 1.63
@@ -243,6 +243,7 @@
free((void *)sfcBrokerStart);
pthread_mutex_unlock(&syncMtx);
+ _SFCB_TRACE_STOP();
if (restartBroker) {
char *emsg=strerror(errno);
@@ -707,19 +708,16 @@
/* trace mask not specified, check in config file */
getControlNum("traceMask",&tmask);
}
-
- if (tmask) {
- if (getControlNum("traceLevel",&tracelevel) || tracelevel == 0) {
- /* no tracelevel found in config file, use default */
- tracelevel = 1;
- }
- if (getenv("SFCB_TRACE_FILE") == NULL &&
- getControlChars("traceFile",&tracefile) == 0) {
- /* only set tracefile from config file if not specified via env */
- _SFCB_TRACE_SETFILE(tracefile);
- }
- _SFCB_TRACE_START(tracelevel,tmask);
+ if (getControlNum("traceLevel",&tracelevel) || tracelevel == 0) {
+ /* no tracelevel found in config file, use default */
+ tracelevel = 1;
}
+ if (getenv("SFCB_TRACE_FILE") == NULL &&
+ getControlChars("traceFile",&tracefile) == 0) {
+ /* only set tracefile from config file if not specified via env */
+ _SFCB_TRACE_SETFILE(tracefile);
+ }
+ _SFCB_TRACE_START(tracelevel,tmask);
// SFCB_DEBUG
#ifndef SFCB_DEBUG
Index: providerMgr.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerMgr.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- providerMgr.c 12 Mar 2012 22:30:52 -0000 1.81
+++ providerMgr.c 11 Apr 2012 22:55:17 -0000 1.82
@@ -1167,7 +1167,7 @@
struct rusage us,ue;
struct timeval sv, ev;
- if (_sfcb_trace_mask & TRACE_RESPONSETIMING) {
+ if (*_ptr_sfcb_trace_mask & TRACE_RESPONSETIMING) {
gettimeofday(&sv,NULL);
getrusage(RUSAGE_SELF,&us);
}
@@ -1317,7 +1317,7 @@
releaseHeap(heapCtl);
#ifdef SFCB_DEBUG
- if (_sfcb_trace_mask & TRACE_RESPONSETIMING) {
+ if (*_ptr_sfcb_trace_mask & TRACE_RESPONSETIMING) {
gettimeofday(&ev,NULL);
getrusage(RUSAGE_SELF,&ue);
_sfcb_trace(1,__FILE__,__LINE__,
Index: trace.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/trace.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- trace.c 21 Jun 2011 22:53:50 -0000 1.17
+++ trace.c 11 Apr 2012 22:55:17 -0000 1.18
@@ -34,6 +34,9 @@
#include <sys/types.h>
#include <unistd.h>
#include <pthread.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <stdlib.h>
#include "config.h"
/* ---------------------------------------------------------------------------*/
@@ -47,7 +50,12 @@
int _sfcb_debug = 0;
unsigned long _sfcb_trace_mask = 0;
+/* use pointer indirect _sfcb_trace_mask to allow shared memory flag */
+unsigned long *_ptr_sfcb_trace_mask = &_sfcb_trace_mask;
+void *vpDP = NULL;
+int shmid;
char *_SFCB_TRACE_FILE = NULL;
+int _SFCB_TRACE_TO_SYSLOG = 0;
TraceId traceIds[]={
{"providerMgr", TRACE_PROVIDERMGR},
@@ -101,7 +109,8 @@
void _sfcb_trace_stop()
{
- _sfcb_debug = 0;
+ shmctl(shmid, IPC_RMID, 0);
+ _sfcb_debug = 0;
}
void _sfcb_trace_init()
@@ -110,6 +119,25 @@
char *var = NULL;
char *err = NULL;
FILE *ferr = NULL;
+ int tryid = 0xDEB001;
+
+ while ((shmid = shmget(tryid, sizeof(unsigned long), (IPC_CREAT | 0660))) < 0 && (errno == EEXIST)) tryid++;
+ mlogf(M_INFO,M_SHOW,"--- Shared memory ID for tracing: %x\n", tryid);
+ if (shmid < 0) {
+ mlogf(M_ERROR,M_SHOW, "shmget(%x) failed in %s at line %d.\n", tryid, __FILE__, __LINE__ );
+ abort();
+ }
+ else {
+ vpDP = shmat( shmid, NULL, 0 );
+
+ if (vpDP == (void*)-1) {// shmat returns an error
+ mlogf(M_ERROR,M_SHOW, "shmat(%u,) failed with errno = %s(%u) in %s at line %d.\n", shmid, strerror(errno), errno, __FILE__, __LINE__ );
+ abort();
+ }
+ else {
+ _ptr_sfcb_trace_mask = (unsigned long *)vpDP;
+ }
+ }
var = getenv("SFCB_TRACE");
if (var != NULL) {
@@ -176,15 +204,23 @@
strftime(tm, 20, "%m/%d/%Y %H:%M:%S", &cttm);
}
- if (colorTrace) {
- changeTextColor(0);
- fprintf(ferr, "[%i] [%s] %d/%p --- %s(%i) : %s\n", level, tm, currentProc, (void *)pthread_self(), file,
- line, msg);
- changeTextColor(1);
- }
- else {
- fprintf(ferr, "[%i] [%s] %d/%p --- %s(%i) : %s\n", level, tm, currentProc, (void *)pthread_self(), file,
+ if (*_ptr_sfcb_trace_mask) {
+ if (_SFCB_TRACE_TO_SYSLOG) {
+ /* ERROR is the default syslog level, if a user does not specify INFO or DEBUG.
+ ERROR guarantees output will end up in syslog */
+ mlogf(M_ERROR,M_SHOW,"[%i] [%s] %d/%p --- %s(%i) : %s\n", level, tm, currentProc, (void *)pthread_self(), file,
line, msg);
+ }
+ else if (colorTrace) {
+ changeTextColor(0);
+ fprintf(ferr, "[%i] [%s] %d/%p --- %s(%i) : %s\n", level, tm, currentProc, (void *)pthread_self(), file,
+ line, msg);
+ changeTextColor(1);
+ }
+ else {
+ fprintf(ferr, "[%i] [%s] %d/%p --- %s(%i) : %s\n", level, tm, currentProc, (void *)pthread_self(), file,
+ line, msg);
+ }
}
free(tm);
@@ -197,9 +233,10 @@
}
-extern void _sfcb_set_trace_mask(int n)
+extern void _sfcb_set_trace_mask(unsigned long n)
{
- _sfcb_trace_mask = n;
+ unsigned long *pulDP = (unsigned long*)vpDP;
+ *pulDP = n;
}
extern void _sfcb_set_trace_file(char * file)
@@ -207,7 +244,11 @@
if (_SFCB_TRACE_FILE) {
free (_SFCB_TRACE_FILE);
}
- if (strcmp(file,"stderr") == 0) {
+ if (strcmp(file, "syslog") == 0) {
+ _SFCB_TRACE_FILE = NULL;
+ _SFCB_TRACE_TO_SYSLOG = 1;
+ }
+ else if (strcmp(file,"stderr") == 0) {
_SFCB_TRACE_FILE = NULL;
} else {
_SFCB_TRACE_FILE = strdup(file);
Index: sfcb.cfg.pre.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sfcb.cfg.pre.in 10 Apr 2012 15:49:56 -0000 1.32
+++ sfcb.cfg.pre.in 11 Apr 2012 22:55:17 -0000 1.33
@@ -245,6 +245,7 @@
## Location of the trace file.
## Can be overriden by setting environment variable SFCB_TRACE_FILE
+## The special value "syslog" will send trace to the syslog
## Default is stderr
#traceFile: stderr
Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- httpAdapter.c 10 Apr 2012 15:49:56 -0000 1.105
+++ httpAdapter.c 11 Apr 2012 22:55:17 -0000 1.106
@@ -1071,13 +1071,13 @@
ctx.sessionId=sessionId;
#ifdef SFCB_DEBUG
- if ((_sfcb_trace_mask & TRACE_RESPONSETIMING) ) {
+ if ((*_ptr_sfcb_trace_mask & TRACE_RESPONSETIMING) ) {
gettimeofday(&sv,NULL);
getrusage(RUSAGE_SELF,&us);
uset=1;
}
- if ((_sfcb_trace_mask & TRACE_XMLIN) ) {
+ if ((*_ptr_sfcb_trace_mask & TRACE_XMLIN) ) {
_sfcb_trace(1,__FILE__,__LINE__,
_sfcb_format_trace("-#- xmlIn %d bytes:\n%*s",inBuf.content_length,
inBuf.content_length,(char*)inBuf.content));
@@ -1101,7 +1101,7 @@
releaseAuthHandle();
#ifdef SFCB_DEBUG
- if (uset && (_sfcb_trace_mask & TRACE_RESPONSETIMING) ) {
+ if (uset && (*_ptr_sfcb_trace_mask & TRACE_RESPONSETIMING) ) {
gettimeofday(&ev,NULL);
getrusage(RUSAGE_SELF,&ue);
_sfcb_trace(1,__FILE__,__LINE__,
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -d -r1.679 -r1.680
--- NEWS 10 Apr 2012 15:49:56 -0000 1.679
+++ NEWS 11 Apr 2012 22:55:17 -0000 1.680
@@ -4,6 +4,7 @@
New features:
- 3440300 Allow forced chunked responses
+- 3501314 Add dynamic logging and syslog output to sfcb trace
Bugs fixed:
Index: trace.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/trace.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- trace.h 6 Feb 2009 00:02:11 -0000 1.16
+++ trace.h 11 Apr 2012 22:55:17 -0000 1.17
@@ -28,7 +28,7 @@
#ifdef SFCB_DEBUG
#define _SFCB_TRACE(LEVEL,STR) \
- if ((_sfcb_trace_mask & __traceMask) && (LEVEL<=_sfcb_debug) && (LEVEL>0) ) \
+ if ((*_ptr_sfcb_trace_mask & __traceMask) && (LEVEL<=_sfcb_debug) && (LEVEL>0) ) \
_sfcb_trace(LEVEL,__FILE__,__LINE__,_sfcb_format_trace STR);
#define _SFCB_ENTER(n,f) \
@@ -59,7 +59,7 @@
#define _SFCB_TRACE_FUNCTION(LEVEL,f) \
_SFCB_TRACE(LEVEL,("Invoking trace function %s",#f)); \
- if ((_sfcb_trace_mask & __traceMask) && (LEVEL<=_sfcb_debug) && (LEVEL>0) ) { \
+ if ((*_ptr_sfcb_trace_mask & __traceMask) && (LEVEL<=_sfcb_debug) && (LEVEL>0) ) { \
f;}
#define _SFCB_ABORT() {\
@@ -70,14 +70,15 @@
_sfcb_trap(n);
extern int _sfcb_debug;
-extern unsigned long _sfcb_trace_mask;
+//MGL use pointer indirect _sfcb_trace_mask to allow shared memory flag
+extern unsigned long *_ptr_sfcb_trace_mask;
extern char *_sfcb_format_trace(char *fmt, ...);
extern void _sfcb_trace(int, char *, int, char *);
extern void _sfcb_trace_start(int l);
extern void _sfcb_trace_init();
extern void _sfcb_trace_stop();
-extern void _sfcb_set_trace_mask(int n);
+extern void _sfcb_set_trace_mask(unsigned long n);
extern void _sfcb_set_trace_file(char * file);
extern void _sfcb_trap(int n);
@@ -98,7 +99,7 @@
#define TRAP(n)
#endif
-extern void _sfcb_set_trace_mask(int n);
+extern void _sfcb_set_trace_mask(unsigned long n);
typedef struct traceId {
char *id;
@@ -140,8 +141,8 @@
#define TRACE_SOCKETS 16384
#define TRACE_MEMORYMGR 32768
#define TRACE_MSGQUEUE 65536
-#define TRACE_XMLPARSING 131072
-#define TRACE_RESPONSETIMING 262144
+#define TRACE_XMLPARSING 131072
+#define TRACE_RESPONSETIMING 262144
#define TRACE_DBPDAEMON 524288
#define TRACE_SLP 1048576
Index: httpComm.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpComm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- httpComm.c 7 Nov 2008 17:00:44 -0000 1.12
+++ httpComm.c 11 Apr 2012 22:55:17 -0000 1.13
@@ -63,7 +63,7 @@
_SFCB_ENTER(TRACE_HTTPDAEMON | TRACE_XMLOUT, "commWrite");
#ifdef SFCB_DEBUG
- if ((_sfcb_trace_mask & TRACE_XMLOUT) ) {
+ if ((*_ptr_sfcb_trace_mask & TRACE_XMLOUT) ) {
char *mp,*m=alloca(count*2),*d=(char*)data;
int i;
_SFCB_TRACE(1,("->> xmlOut %d bytes:\n",count));
|
|
From: Michael Chase-S. <mc...@us...> - 2012-04-11 20:01:11
|
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 e75d7ec2dc8927f5bbf937d1e543f220c401ef09 (commit)
from ae06fc13d0b2f30d3077c1247ca0e18e3ce8bc21 (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 e75d7ec2dc8927f5bbf937d1e543f220c401ef09
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Apr 10 17:25:32 2012 -0400
[ 3516167 ] Force kill sfcbd on stop if needed
add sfcbrepos
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 255ae84..a16b4d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-<<<<<<< HEAD
+2012-04-10 Michael Chase-Salerno <br...@li...>
+
+ * ABTScript:
+ [ 3516167 ] Force kill sfcbd on stop if needed
+
2012-04-09 Chris Buccella <buc...@li...>
* cimXmlGen.c:
diff --git a/test/ABT/ABTScript b/test/ABT/ABTScript
index 05fbfbd..e70cdca 100755
--- a/test/ABT/ABTScript
+++ b/test/ABT/ABTScript
@@ -214,6 +214,7 @@ BUILD_SFCB()
FIND_DELTA "disk" $out
echo "$out bytes $delta" >> $BASE_DIR/$REPORT_SUMMARY
echo "disk:$out" >> $FPCUR
+ sfcbrepos -fi # Ensure we have a clean repo
SFCB_START
SFCB_TESTS
DUALOUT "SECOND TEST RUN:"
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2012-04-11 15:44:22
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv15918/src/org/sblim/cimclient/internal/wbem
Modified Files:
Tag: Experimental
WBEMClientCIMXML.java
Log Message:
3516848 - enumerateNamespaces() method to WBEMClient
Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.58
retrieving revision 1.21.2.59
diff -u -d -r1.21.2.58 -r1.21.2.59
--- WBEMClientCIMXML.java 5 Apr 2012 13:16:54 -0000 1.21.2.58
+++ WBEMClientCIMXML.java 11 Apr 2012 15:44:20 -0000 1.21.2.59
@@ -60,6 +60,7 @@
* 3514537 2012-04-03 blaschke-oss TCK: execQueryInstances requires boolean, not Boolean
* 3514685 2012-04-03 blaschke-oss TCK: getProperty must return default values
* 3515180 2012-04-05 blaschke-oss JSR48 log dir/file should handle UNIX/Win separators
+ * 3516848 2012-04-11 blaschke-oss enumerateNamespaces() method to WBEMClient
*/
package org.sblim.cimclient.internal.wbem;
@@ -175,6 +176,8 @@
private volatile boolean iClosed = false;
+ private String iInteropNamespace = null;
+
/**
* Ctor.
*/
@@ -1084,6 +1087,56 @@
}
}
+ // DSP1033 states that CIMOMs shall include an Interop Namespace and that
+ // the name of this Interop Namespace shall be either "interop" (preferred)
+ // or "root/interop" while OpenPegasus 2.11 and earlier implemented
+ // "root/PG_InterOp" prior to adopting DSP1033.
+ private static final String[] InteropNamespaces = { "interop", "root/interop",
+ "root/PG_InterOp" };
+
+ private CloseableIterator<CIMObjectPath> enumerateNamespace(String pNamespace) {
+ if (pNamespace != null && pNamespace.trim().length() > 0) {
+ try {
+ CloseableIterator<CIMObjectPath> result = enumerateInstanceNames(new CIMObjectPath(
+ "CIM_Namespace", pNamespace));
+ if (result != null) return result;
+ } catch (Exception e) {
+ // namespace may not exist
+ }
+ }
+ return null;
+ }
+
+ public CloseableIterator<CIMObjectPath> enumerateNamespaces(String pNamespace)
+ throws WBEMException {
+ CloseableIterator<CIMObjectPath> result;
+
+ // First, try the user's specified namespace (if any)
+ if (pNamespace != null && pNamespace.trim().length() > 0) {
+ result = enumerateNamespace(pNamespace);
+ if (result != null) return result;
+ }
+
+ // Second, try the saved interop namespace (if any)
+ if (this.iInteropNamespace != null) {
+ result = enumerateNamespace(this.iInteropNamespace);
+ if (result != null) return result;
+ this.iInteropNamespace = null;
+ }
+
+ // Finally, try the default interop namespace names
+ for (int i = 0; i < InteropNamespaces.length; i++) {
+ result = enumerateNamespace(InteropNamespaces[i]);
+ if (result != null) {
+ if (this.iInteropNamespace == null) this.iInteropNamespace = InteropNamespaces[i];
+ return result;
+ }
+ }
+
+ throw new WBEMException(WBEMException.CIM_ERR_FAILED,
+ "Interop namespaces do not exist, CIMOM may not support DSP1033");
+ }
+
public CloseableIterator<CIMQualifierType<?>> enumerateQualifierTypes(CIMObjectPath pPath)
throws WBEMException {
|
|
From: Chris B. <buc...@us...> - 2012-04-10 15:49:59
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv16091
Modified Files:
ChangeLog NEWS cimXmlRequest.c control.c httpAdapter.c
sfcb.cfg.pre.in
Log Message:
[ 3440300 ] Allow forced chunked responses
Index: cimXmlRequest.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlRequest.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- cimXmlRequest.c 28 Mar 2012 15:48:12 -0000 1.70
+++ cimXmlRequest.c 10 Apr 2012 15:49:56 -0000 1.71
@@ -54,14 +54,14 @@
#ifdef LOCAL_CONNECT_ONLY_ENABLE
// from httpAdapter.c
-int noChunking = 0;
+int chunkMode = CHUNK_NEVER;
#endif // LOCAL_CONNECT_ONLY_ENABLE
typedef struct handler {
RespSegments(*handler) (CimXmlRequestContext *, RequestHdr * hdr);
} Handler;
-extern int noChunking;
+extern int chunkMode;
extern CMPIBroker *Broker;
extern UtilStringBuffer *newStringBuffer(int s);
@@ -1052,7 +1052,7 @@
binCtx.xmlAs=binCtx.noResp=0;
binCtx.chunkFncs=ctx->chunkFncs;
- if (noChunking || ctx->teTrailers==0)
+ if (ctx->teTrailers==0)
hdr->chunkedMode=binCtx.chunkedMode=0;
else {
sreq.hdr.flags|=FL_chunked;
@@ -1072,7 +1072,7 @@
closeProviderContext(&binCtx);
- if (noChunking || ctx->teTrailers==0) {
+ if (ctx->teTrailers==0) {
if (err == 0) {
rs = genResponses(&binCtx, resp, l);
} else {
@@ -1505,14 +1505,14 @@
binCtx.xmlAs=binCtx.noResp=0;
binCtx.chunkFncs=ctx->chunkFncs;
- if (noChunking || ctx->teTrailers==0)
+ if (ctx->teTrailers==0) {
hdr->chunkedMode=binCtx.chunkedMode=0;
+ }
else {
sreq->hdr.flags|=FL_chunked;
hdr->chunkedMode=binCtx.chunkedMode=1;
}
binCtx.pAs=NULL;
-
_SFCB_TRACE(1, ("--- Getting Provider context"));
irc = getProviderContext(&binCtx, (OperationHdr *) req);
_SFCB_TRACE(1, ("--- Provider context gotten irc: %d",irc));
@@ -1524,7 +1524,7 @@
_SFCB_TRACE(1, ("--- Back from Providers"));
closeProviderContext(&binCtx);
- if (noChunking || ctx->teTrailers==0) {
+ if (ctx->teTrailers==0) {
if (err == 0) {
rs = genResponses(&binCtx, resp, l);
} else {
@@ -1597,7 +1597,7 @@
binCtx.xmlAs=XML_asObj; binCtx.noResp=0;
binCtx.chunkFncs=ctx->chunkFncs;
- if (noChunking || ctx->teTrailers==0)
+ if (ctx->teTrailers==0)
hdr->chunkedMode=binCtx.chunkedMode=0;
else {
sreq.hdr.flags|=FL_chunked;
@@ -1617,7 +1617,7 @@
_SFCB_TRACE(1, ("--- Back from Provider"));
closeProviderContext(&binCtx);
- if (noChunking || ctx->teTrailers==0) {
+ if (ctx->teTrailers==0) {
if (err == 0) {
rs = genResponses(&binCtx, resp, l);
} else {
@@ -1791,7 +1791,7 @@
binCtx.pAs=NULL;
binCtx.chunkFncs=ctx->chunkFncs;
- if (noChunking || ctx->teTrailers==0)
+ if (ctx->teTrailers==0)
hdr->chunkedMode=binCtx.chunkedMode=0;
else {
sreq->hdr.flags|=FL_chunked;
@@ -1810,7 +1810,7 @@
closeProviderContext(&binCtx);
- if (noChunking || ctx->teTrailers==0) {
+ if (ctx->teTrailers==0) {
if (err == 0) {
rs = genResponses(&binCtx, resp, l);
} else {
@@ -1982,7 +1982,7 @@
binCtx.pAs=NULL;
binCtx.chunkFncs=ctx->chunkFncs;
- if (noChunking || ctx->teTrailers==0)
+ if (ctx->teTrailers==0)
hdr->chunkedMode=binCtx.chunkedMode=0;
else {
sreq->hdr.flags|=FL_chunked;
@@ -2000,7 +2000,7 @@
_SFCB_TRACE(1, ("--- Back from Provider"));
closeProviderContext(&binCtx);
- if (noChunking || ctx->teTrailers==0) {
+ if (ctx->teTrailers==0) {
if (err == 0) {
rs = genResponses(&binCtx, resp, l);
} else {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.757
retrieving revision 1.758
diff -u -d -r1.757 -r1.758
--- ChangeLog 9 Apr 2012 21:21:33 -0000 1.757
+++ ChangeLog 10 Apr 2012 15:49:56 -0000 1.758
@@ -1,3 +1,8 @@
+2012-04-10 Chris Buccella <buc...@li...>
+
+ * cimXmlRequest.c, control.c, httpAdapter.c, sfcb.cfg.pre.in:
+ [ 3440300 ] Allow forced chunked responses
+
2012-04-05 Narasimha Sharoff <nsh...@us...>
* control.c:
Index: sfcb.cfg.pre.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- sfcb.cfg.pre.in 29 Mar 2012 15:39:33 -0000 1.31
+++ sfcb.cfg.pre.in 10 Apr 2012 15:49:56 -0000 1.32
@@ -38,6 +38,8 @@
#httpLocalOnly: false
## Enable HTTP chunking. This will reduce memory usage of HTTP process.
+## Possible values are: true, false, always
+## "always" will chunk responses regardless of the client's HTTP headers
## Default is true
useChunking: true
Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- httpAdapter.c 30 Mar 2012 21:51:31 -0000 1.104
+++ httpAdapter.c 10 Apr 2012 15:49:56 -0000 1.105
@@ -78,7 +78,12 @@
static int doUdsAuth;
#endif
static int doFork = 0;
-int noChunking = 0;
+
+#define CHUNK_NEVER 0
+#define CHUNK_ALLOW 1
+#define CHUNK_FORCE 2
+int chunkMode = CHUNK_ALLOW;
+
int sfcbSSLMode = 0;
int httpLocalOnly = 0; /* 1 = only listen on loopback interface */
static int hMax;
@@ -1055,7 +1060,9 @@
ctx.principal = inBuf.principal;
ctx.role = extras.role;
ctx.host = inBuf.host;
- ctx.teTrailers = inBuf.trailers;
+ /* override based on sfcb.cfg value */
+ ctx.teTrailers = (chunkMode == CHUNK_FORCE) ? 1 : inBuf.trailers;
+ if (chunkMode == CHUNK_NEVER) ctx.teTrailers = 0;
ctx.cimXmlDocLength = len - hl;
ctx.commHndl = &conn_fd;
@@ -1748,9 +1755,11 @@
if (getControlNum("keepaliveMaxRequest", &keepaliveMaxRequest))
keepaliveMaxRequest = 10;
- if (getControlBool("useChunking", &noChunking))
- noChunking = 0;
- noChunking = noChunking == 0;
+ char* chunkStr;
+ if (getControlChars("useChunking", &chunkStr) == 0) {
+ if (strcmp(chunkStr, "false") == 0) chunkMode = CHUNK_NEVER;
+ else if (strcmp(chunkStr, "always") == 0) chunkMode = CHUNK_FORCE;
+ }
/*
* grab commandline options
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -d -r1.678 -r1.679
--- NEWS 9 Apr 2012 21:21:14 -0000 1.678
+++ NEWS 10 Apr 2012 15:49:56 -0000 1.679
@@ -1,6 +1,10 @@
Changes in 1.3.15
=================
+New features:
+
+- 3440300 Allow forced chunked responses
+
Bugs fixed:
- 3514443 sfcb 1.3.14 compilation error
Index: control.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/control.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- control.c 9 Apr 2012 21:20:57 -0000 1.44
+++ control.c 10 Apr 2012 15:49:56 -0000 1.45
@@ -90,7 +90,7 @@
{"doBasicAuth", 2, "false"},
{"doUdsAuth", 2, "false"},
- {"useChunking", 2, "false"},
+ {"useChunking", 0, "true"},
{"chunkSize", 1, "50000"},
{"trimWhitespace", 2, "true"},
|
|
From: Narasimha S. <nsh...@us...> - 2012-04-09 21:21:35
|
Update of /cvsroot/sblim/sfcb In directory vz-cvs-3.sog:/tmp/cvs-serv13701 Modified Files: ChangeLog Log Message: [ 3514627 ] unsupported sfcb.cfg param - use exit call Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/sfcb/ChangeLog,v retrieving revision 1.756 retrieving revision 1.757 diff -u -d -r1.756 -r1.757 --- ChangeLog 3 Apr 2012 19:32:52 -0000 1.756 +++ ChangeLog 9 Apr 2012 21:21:33 -0000 1.757 @@ -1,3 +1,8 @@ +2012-04-05 Narasimha Sharoff <nsh...@us...> + + * control.c: + [ 3514627 ] unsupported sfcb.cfg param - use exit call + 2012-04-03 Chris Buccella <buc...@li...> * utilTypeCk.c: |
|
From: Narasimha S. <nsh...@us...> - 2012-04-09 21:21:16
|
Update of /cvsroot/sblim/sfcb In directory vz-cvs-3.sog:/tmp/cvs-serv13690 Modified Files: NEWS Log Message: [ 3514627 ] unsupported sfcb.cfg param - use exit call Index: NEWS =================================================================== RCS file: /cvsroot/sblim/sfcb/NEWS,v retrieving revision 1.677 retrieving revision 1.678 diff -u -d -r1.677 -r1.678 --- NEWS 3 Apr 2012 19:32:52 -0000 1.677 +++ NEWS 9 Apr 2012 21:21:14 -0000 1.678 @@ -4,6 +4,7 @@ Bugs fixed: - 3514443 sfcb 1.3.14 compilation error +- 3514627 unsupported sfcb.cfg param - use exit call Changes in 1.3.14 ================= |
|
From: Narasimha S. <nsh...@us...> - 2012-04-09 21:20:59
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv13662
Modified Files:
control.c
Log Message:
[ 3514627 ] unsupported sfcb.cfg param - use exit call
Index: control.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/control.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- control.c 30 Mar 2012 17:56:41 -0000 1.43
+++ control.c 9 Apr 2012 21:20:57 -0000 1.44
@@ -233,7 +233,7 @@
if (err) {
mlogf(M_INFO,M_SHOW,"--- Broker terminated because of previous error(s)\n");
- abort();
+ exit(1);
}
return 0;
|
|
From: Narasimha S. <nsh...@us...> - 2012-04-09 21:15:07
|
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 ae06fc13d0b2f30d3077c1247ca0e18e3ce8bc21 (commit)
from d3323a110093a924f00a425d67c61b6e7718ce61 (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 ae06fc13d0b2f30d3077c1247ca0e18e3ce8bc21
Author: Narasimha Sharoff <nsh...@us...>
Date: Mon Apr 9 14:07:42 2012 -0700
[ 3514627 ] unsupported sfcb.cfg param - use exit call
-----------------------------------------------------------------------
Summary of changes:
diff --git a/NEWS b/NEWS
index ab110b1..2bb04e4 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,7 @@ Changes in 1.3.15
=================
Bugs Fixed:
+- 3514627 unsupported sfcb.cfg param - use exit call
Changes in 1.3.14
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2012-04-09 19:41:29
|
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 d3323a110093a924f00a425d67c61b6e7718ce61 (commit)
from aebd8df4389cc6642de2d5bac9ed996f15fad949 (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 d3323a110093a924f00a425d67c61b6e7718ce61
Author: buccella <buc...@li...>
Date: Mon Apr 9 15:41:25 2012 -0400
added 1.3.15 section
-----------------------------------------------------------------------
Summary of changes:
diff --git a/NEWS b/NEWS
index ab5e248..ab110b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
Changes in 1.4.3
================
-Everything in 1.3.13 and 1.3.14, plus:
+Everything in 1.3.13, 1.3.14, and 1.3.15 (see below), plus:
New features:
- 3441679 Add a feature to validate CMPI types
@@ -10,7 +10,6 @@ New features:
Bugs fixed:
- 3495804 Cleanup: httpProcId still defined, wrong define in cimXmlGen
-- 3498719 Better SSL error reporting for sfcb
- 3516167 Force kill sfcbd on stop if needed
Changes in 1.4.2
@@ -89,6 +88,12 @@ Everything in 1.3.10, plus:
- 3104761 cimRsRequest.h missing from make-dist tarball
- 3107553 Remove Large Volume Support
+Changes in 1.3.15
+=================
+
+Bugs Fixed:
+
+
Changes in 1.3.14
=================
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2012-04-09 18:37:51
|
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 aebd8df4389cc6642de2d5bac9ed996f15fad949 (commit)
via f318700e41652a114a7e59d255c2b6199ae90f9a (commit)
via 13d9aa5e597b719606255d5a81ac228b9b64e669 (commit)
from 7c35e2a15e92d7822121aac634896b80faea3d1a (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 aebd8df4389cc6642de2d5bac9ed996f15fad949
Merge: f318700 7c35e2a
Author: buccella <buc...@li...>
Date: Mon Apr 9 14:37:53 2012 -0400
Changelog merge
commit f318700e41652a114a7e59d255c2b6199ae90f9a
Author: buccella <buc...@li...>
Date: Mon Apr 9 14:35:31 2012 -0400
[ 3419721 ] reset CMPIValue buffer in str2CMPIValue
commit 13d9aa5e597b719606255d5a81ac228b9b64e669
Author: buccella <buc...@li...>
Date: Mon Apr 9 13:45:28 2012 -0400
[ 3512094 ] SFCB can leak PAM handles under error conditions
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index c894684..255ae84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+<<<<<<< HEAD
+2012-04-09 Chris Buccella <buc...@li...>
+
+ * cimXmlGen.c:
+ [ 3419721 ] reset CMPIValue buffer in str2CMPIValue
+
+ * httpAdapter.c, sfcBasicPAMAuthentication.c:
+ [ 3512094 ] SFCB can leak PAM handles under error conditions
+
2012-04-09 Michael Chase-Salerno <br...@li...>
* sfcb.init-none.in
diff --git a/NEWS b/NEWS
index 85f2653..ab5e248 100644
--- a/NEWS
+++ b/NEWS
@@ -156,6 +156,8 @@ Bugs Fixed:
- 3441028 sblim-sfcb fails on large https requests
- 3416054 Provider continues despite SIGSEGV
- 3512425 SequenceContext needs to be set at startup
+- 3512094 SFCB can leak PAM handles under error conditions
+- 3419721 reset CMPIValue buffer in str2CMPIValue
Changes in 1.3.13
=================
diff --git a/cimXmlGen.c b/cimXmlGen.c
index e8db53f..46f056a 100644
--- a/cimXmlGen.c
+++ b/cimXmlGen.c
@@ -353,6 +353,7 @@ str2CMPIValue(CMPIType type, XtokValue val, XtokValueReference * ref,
CMPIType t = 0;
CMPIStatus rc = {CMPI_RC_OK, NULL};
+ memset(&value, 0, sizeof(CMPIValue));
if (type == 0) {
type = guessType(val.value);
}
diff --git a/httpAdapter.c b/httpAdapter.c
index b19ad4a..d0ca581 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -156,6 +156,17 @@ struct auth_extras {
};
typedef struct auth_extras AuthExtras;
+AuthExtras extras = {NULL, NULL, NULL, NULL};
+
+void releaseAuthHandle() {
+ _SFCB_ENTER(TRACE_HTTPDAEMON, "releaseAuthHandle");
+ if (extras.release) {
+ _SFCB_TRACE(1,("--- extras.authHandle = %p", extras.authHandle));
+ extras.release(extras.authHandle);
+ extras.release = NULL;
+ }
+}
+
typedef int (*Authenticate) (char *principal, char *pwd);
typedef int (*Authenticate2) (char *principal, char *pwd, AuthExtras *extras);
@@ -251,7 +262,7 @@ remProcCtl()
* Return 1 on success, 0 on fail, -1 on expired
*/
int
-baValidate(char *cred, char **principal, AuthExtras* extras)
+baValidate(char *cred, char **principal)
{
char *auth,
*pw = NULL;
@@ -295,7 +306,7 @@ baValidate(char *cred, char **principal, AuthExtras* extras)
else {
*principal = strdup(auth);
if (authenticate2)
- ret = authenticate2(auth, pw, extras);
+ ret = authenticate2(auth, pw, &extras);
else
ret = authenticate(auth, pw);
@@ -364,6 +375,11 @@ handleSigUsr1(int sig)
}
}
+static void handleSigPipe(int sig)
+{
+ exit(1);
+}
+
static void
freeBuffer(Buffer * b)
{
@@ -1067,8 +1083,6 @@ doHttpRequest(CommHndl conn_fd)
}
#endif
- AuthExtras extras = {NULL, NULL, NULL, NULL};
-
if (!authorized && !discardInput && doBa) {
if (inBuf.authorization) {
@@ -1085,7 +1099,7 @@ doHttpRequest(CommHndl conn_fd)
extras.clientIp = ipstr;
// fprintf(stderr, "client is: %s\n", ipstr);
- barc = baValidate(inBuf.authorization,&inBuf.principal,&extras);
+ barc = baValidate(inBuf.authorization,&inBuf.principal);
#ifdef ALLOW_UPDATE_EXPIRED_PW
if (barc == AUTH_EXPIRED) {
@@ -1142,6 +1156,7 @@ doHttpRequest(CommHndl conn_fd)
exit(1);
}
if (discardInput) {
+ releaseAuthHandle();
free(hdr);
freeBuffer(&inBuf);
_SFCB_RETURN(discardInput - 1);
@@ -1205,9 +1220,7 @@ doHttpRequest(CommHndl conn_fd)
if (response.buffer != NULL)
cleanupCimXmlRequest(&response);
- if (extras.release) {
- extras.release(extras.authHandle);
- }
+ releaseAuthHandle();
#ifdef SFCB_DEBUG
if (uset && (_sfcb_trace_mask & TRACE_RESPONSETIMING)) {
@@ -1267,6 +1280,7 @@ handleHttpRequest(int connFd, int sslMode)
semAcquireUnDo(httpProcSem, 0);
semReleaseUnDo(httpProcSem, httpProcIdX + 1);
semRelease(httpWorkSem, 0);
+ atexit(releaseAuthHandle);
atexit(uninitGarbageCollector);
atexit(sunsetControl);
}
@@ -2069,6 +2083,7 @@ httpDaemon(int argc, char *argv[], int sslMode)
setSignal(SIGINT, SIG_IGN, 0);
setSignal(SIGTERM, SIG_IGN, 0);
setSignal(SIGHUP, SIG_IGN, 0);
+ setSignal(SIGPIPE, handleSigPipe,0);
#if defined USE_SSL
if (sslMode) {
diff --git a/objectImpl.c b/objectImpl.c
index a3ab0d1..b26f521 100644
--- a/objectImpl.c
+++ b/objectImpl.c
@@ -555,7 +555,7 @@ removeClObject(ClObjectHdr * hdr, int id)
{
_SFCB_ENTER(TRACE_OBJECTIMPL, "removeClObject");
// fprintf(stderr, "replaceClString: %p replacing entry for we're skipping %d\n", hdr, (id-1));
- char *ts, *fs, *tmpstr = NULL;
+ char *ts, *fs;
long i, l, u;
ClStrBuf *fb;
diff --git a/sfcBasicPAMAuthentication.c b/sfcBasicPAMAuthentication.c
index 6329637..1f7b111 100644
--- a/sfcBasicPAMAuthentication.c
+++ b/sfcBasicPAMAuthentication.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <security/pam_appl.h>
+#include "trace.h"
#define SFCB_PAM_APP "sfcb"
@@ -60,8 +61,11 @@ sfcBasicConv(int num_msg, const struct pam_message **msg,
}
void closePam(pam_handle_t* handle) {
+ _SFCB_ENTER(TRACE_HTTPDAEMON, "closePam");
int rc = PAM_SUCCESS;
+ _SFCB_TRACE(1,("--- pam_end for handle %p", handle));
pam_end(handle, rc);
+ _SFCB_TRACE(1,("--- pam_end rc = %d", rc));
}
static int
@@ -75,7 +79,10 @@ _sfcBasicAuthenticateRemote(char *user, char *pw, AuthExtras *extras)
int rc,
retval;
+ _SFCB_ENTER(TRACE_HTTPDAEMON, "_sfcBasicAuthenticateRemote");
+
rc = pam_start(SFCB_PAM_APP, user, &sfcConvStruct, &pamh);
+ _SFCB_TRACE(1,("--- pam_start, pamh = %p", pamh));
if (extras && extras->clientIp) {
pam_set_item(pamh, PAM_RHOST, extras->clientIp);
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2012-04-09 17:11:00
|
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 7c35e2a15e92d7822121aac634896b80faea3d1a (commit)
via a5bfd6693f3e8687fe1e490a5acef116b890653f (commit)
from b16f7d57d6ba175af30e3de51385a58fccc4cd14 (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 7c35e2a15e92d7822121aac634896b80faea3d1a
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Apr 9 13:10:26 2012 -0400
3516167 Force kill sfcbd on stop if needed
commit a5bfd6693f3e8687fe1e490a5acef116b890653f
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Apr 9 13:08:59 2012 -0400
3516167 Force kill sfcbd on stop if needed
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index fc26bb9..c894684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-09 Michael Chase-Salerno <br...@li...>
+
+ * sfcb.init-none.in
+ [ 3516167 ] Force kill sfcbd on stop if needed
+
2012-04-05 Narasimha Sharoff <nsh...@us...>
* control.c:
diff --git a/NEWS b/NEWS
index 9f97b61..85f2653 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ New features:
Bugs fixed:
- 3495804 Cleanup: httpProcId still defined, wrong define in cimXmlGen
- 3498719 Better SSL error reporting for sfcb
+- 3516167 Force kill sfcbd on stop if needed
Changes in 1.4.2
================
diff --git a/sfcb.init-none.in b/sfcb.init-none.in
index b5bbda1..b777237 100644
--- a/sfcb.init-none.in
+++ b/sfcb.init-none.in
@@ -20,10 +20,26 @@ start() {
}
stop() {
- echo -n "Shutting down sfcb: "
- killall sfcbd && echo "done." && return 0 ||
- echo "failed."
- return 1
+ echo -n "Shutting down sfcb: "
+ if killall sfcbd
+ then
+ sleep 3
+ # If it hasn't died gracefully, kill it
+ if killall -KILL sfcbd 2>/dev/null
+ then
+ # In this case, it needed to be killed
+ echo "failed(killed)."
+ exit 1
+ else
+ # In this case, it was already dead
+ echo "done."
+ exit 0
+ fi
+ else
+ # In this case, it probably wasn't running
+ echo "failed."
+ exit 1
+ fi
}
reload() {
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2012-04-09 16:21:46
|
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 b16f7d57d6ba175af30e3de51385a58fccc4cd14 (commit)
via ff0223adb2143fa957466e93de938214da37fde5 (commit)
from c482054e6ad1b071f901d5734672a94f4e947c62 (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 b16f7d57d6ba175af30e3de51385a58fccc4cd14
Merge: ff0223a c482054
Author: buccella <buc...@li...>
Date: Mon Apr 9 12:20:30 2012 -0400
Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb
merge for NEWS
Conflicts:
NEWS
commit ff0223adb2143fa957466e93de938214da37fde5
Author: buccella <buc...@li...>
Date: Mon Apr 9 12:15:50 2012 -0400
fixing up 1.3.14 section
-----------------------------------------------------------------------
Summary of changes:
diff --git a/NEWS b/NEWS
index ef47b90..9f97b61 100644
--- a/NEWS
+++ b/NEWS
@@ -101,6 +101,13 @@ New Features:
- 3367361 Allow for releasing auth handle after CIM request completes
- 3367363 Add CMPIRole Support
- 3512575 Add indication delivery thread limit and timeout
+- 3435778 Preserve leading/trailing whitespace in values
+- 3433733 CreationClassNames should be supplied
+- 3446179 Add a feature to validate CMPI types
+- 3484025 Disable indication sequencing
+- 3462309 Do not allow multiple instances of sfcb
+- 3488688 Don't spawn logger for clients
+
Bugs Fixed:
@@ -108,30 +115,45 @@ Bugs Fixed:
- 3416055 SIGSEGV sometimes does not print provider name
- 3416167 CIM_InstDeletion not in class repo by default
- 3422650 Associators calls to IndicationService depends on cmpi-base
+- 3428806 type=null in authorizeFilter call
+- 3478930 Handle SIGPIPE in providerMgr
+- 3478933 Sequence Number reset issues
+- 3483294 InternalProvider Should Handle SFCB_RegisteredProfile
+- 3485438 segfault while retrying to deliver an indication
+- 3486814 sfcb crashes while freeing the cimxml response
+- 3485830 SFCB Makes Redundant ActivateFilter Calls
+- 3487419 TestIndication Provider Does Not Enable Correctly
+- 3487675 Log messages can be concatenated
+- 3492362 Problem with whitespace trimming if local connect only
+- 3457460 PAM_RHOST set wrong
+- 3495343 Bad pointer references in trace statements
- 3416164 Don't write CIM_IndicationService to disk
+- 3495801 Correction to 3495343
- 3495789 Makefile improvements for test suite
- 3495806 isChild() can cause a provider mismatch
-- 3495343 Bad pointer references in trace statements
-- 3495801 Correction to 3495343
+- 3483200 duplicate indication deliveries
- 3496061 IndicationSubscription May Be Undeletable
+- 3484083 Exclude SFCBIndicationID
- 3496383 Faster Return from CBDeliverIndication
+- 3416060 sigsegv in tool_mm_flush()
+- 3497096 double free during stopProc
- 3497765 Better Error Handling in sfcb Provider Manager and Driver
- 3497950 SFCB Semaphore Handling Improvements
- 3498275 Remove __Namespace
+- 3498044 RIEnabled conflicts with settable retries
- 3426027 cimAccountPassThrough does not set return code
-- 3492362 Problem with whitespace trimming if local connect only
+- 3498719 Better SSL error reporting for sfcb
+- 3471814 sfcb SEGV fault in objectImpl.c:131 (ClObjectGetClString)
- 3499930 Check file repository writes
-- 3457460 PAM_RHOST set wrong
+- 3497209 oom panic: out of memory using fsp indprovider
- 3504607 CMPIRole Support in brokerUpc
+- 3498496 sfcb hangs and fails to respond to CIM requests
- 3510458 Malformed XML response to GetProperty
- 3510456 GetProperty calls not passing keys to providers
+- 3505407 Client openlog changes settings
- 3408288 Safer Signal Handlers
-- 3487419 TestIndication Provider Does Not Enable Correctly
- 3441028 sblim-sfcb fails on large https requests
- 3416054 Provider continues despite SIGSEGV
-- 3505407 Client openlog changes settings
-- 3485830 SFCB Makes Redundant ActivateFilter Calls
-- 3483294 InternalProvider Should Handle SFCB_RegisteredProfile
- 3512425 SequenceContext needs to be set at startup
Changes in 1.3.13
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Narasimha S. <nsh...@us...> - 2012-04-05 16:07:02
|
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 c482054e6ad1b071f901d5734672a94f4e947c62 (commit)
from 4699356c2c7973994aa0ad280d1a848c984d9a0f (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 c482054e6ad1b071f901d5734672a94f4e947c62
Author: nsharoff <nsharoff@nsharoff.(none)>
Date: Thu Apr 5 09:06:26 2012 -0700
[ 3514627 ] unsupported sfcb.cfg param - use exit call
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 163f43b..fc26bb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-05 Narasimha Sharoff <nsh...@us...>
+
+ * control.c:
+ [ 3514627 ] unsupported sfcb.cfg param - use exit call
+
2012-04-04 Narasimha Sharoff <nsh...@us...>
* providerDrv.c, providerMgr.c, sfcBroker.c:
diff --git a/control.c b/control.c
index 3b2e7f3..3198f99 100644
--- a/control.c
+++ b/control.c
@@ -243,7 +243,7 @@ setupControl(char *fn)
if (err) {
mlogf(M_INFO, M_SHOW,
"--- Broker terminated because of previous error(s)\n");
- abort();
+ exit(1);
}
return 0;
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2012-04-05 13:16:56
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util
In directory vz-cvs-3.sog:/tmp/cvs-serv1533/utst/org/sblim/cimclient/unittest/util
Modified Files:
Tag: Experimental
WBEMConfigurationTest.java
Log Message:
3515180 - JSR48 log dir/file should handle UNIX/Win separators
Index: WBEMConfigurationTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util/WBEMConfigurationTest.java,v
retrieving revision 1.3.2.12
retrieving revision 1.3.2.13
diff -u -d -r1.3.2.12 -r1.3.2.13
--- WBEMConfigurationTest.java 3 Apr 2012 19:16:35 -0000 1.3.2.12
+++ WBEMConfigurationTest.java 5 Apr 2012 13:16:54 -0000 1.3.2.13
@@ -23,6 +23,7 @@
* 2930341 2010-01-12 blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0
* 3496355 2012-03-02 blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
* 3514685 2012-04-03 blaschke-oss TCK: getProperty must return default values
+ * 3515180 2012-04-05 blaschke-oss JSR48 log dir/file should handle UNIX/Win separators
*/
package org.sblim.cimclient.unittest.util;
@@ -268,9 +269,9 @@
.getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "0");
verify("Uninit byte limit", EQUAL, client
.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), "5242880");
- verify("Uninit log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR), null);
+ verify("Uninit log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR), "%t");
verify("Uninit log file", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_FILENAME),
- WBEMConfigurationDefaults.LOG_FILE_LOCATION);
+ "cimclient_log_%g.txt");
verify("Uninit num files", EQUAL, client
.getProperty(WBEMClientConstants.PROP_LOG_NUM_FILES), "3");
verify("Uninit timeout", EQUAL, client.getProperty(WBEMClientConstants.PROP_TIMEOUT), "0");
|
|
From: Narasimha S. <nsh...@us...> - 2012-04-04 17:54:14
|
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 4699356c2c7973994aa0ad280d1a848c984d9a0f (commit)
from 3429a6d00ca9ec7e3c138ddbfcfb767b70bd4301 (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 4699356c2c7973994aa0ad280d1a848c984d9a0f
Author: nsharoff <nsharoff@nsharoff.(none)>
Date: Wed Apr 4 10:53:18 2012 -0700
[ 3497096 ] double free during stopProc()
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 52d9310..163f43b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-04-04 Narasimha Sharoff <nsh...@us...>
+ * providerDrv.c, providerMgr.c, sfcBroker.c:
+ [ 3497096 ] double free during stopProc()
+
+2012-04-04 Narasimha Sharoff <nsh...@us...>
+
* providerDrv.c, providerMgr.c, providerMgr.h, support.c:
[ 3416060 ] SIGSEGV in tool_mm_flush()
diff --git a/providerDrv.c b/providerDrv.c
index 0398ec8..4a8d4b0 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -503,11 +503,11 @@ stopProc(void *p)
mlogf(M_INFO, M_SHOW, "--- stopped %s %d\n", processName, getpid());
ctx->ft->release(ctx);
- uninit_sfcBroker();
- uninitProvProcCtl();
- uninitSocketPairs();
- sunsetControl();
- uninitGarbageCollector();
+ //uninit_sfcBroker(); /* 3497096 */
+ //uninitProvProcCtl();
+ //uninitSocketPairs();
+ //sunsetControl();
+ //uninitGarbageCollector();
exit(0);
}
diff --git a/providerMgr.c b/providerMgr.c
index 8516e33..1270a0b 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -115,6 +115,9 @@ notSupported(int *requestor, OperationHdr * req)
free(req);
}
+int prov_rdy_state = -1; /* 3497096 :77022 - stopBroker() reads this value */
+pthread_mutex_t syncMtx=PTHREAD_MUTEX_INITIALIZER; /* shared with stopBroker */
+
/*
* ------------- --- Instance Provider support ---className -------------
*/
@@ -1034,11 +1037,19 @@ processProviderMgrRequests()
req->nameSpace.data, req->className.data, req->type,
requestor));
+ pthread_mutex_lock(&syncMtx); /* 77022 */
+ prov_rdy_state = -1;
+ pthread_mutex_unlock(&syncMtx);
+
sigprocmask(SIG_SETMASK, &mask, &old_mask);
hdlr = mHandlers[req->type];
hdlr.handler(&requestor, req);
sigprocmask(SIG_SETMASK, &old_mask, NULL);
+ pthread_mutex_lock(&syncMtx); /* 77022 */
+ prov_rdy_state = 1;
+ pthread_mutex_unlock(&syncMtx);
+
_SFCB_TRACE(1,
("--- Mgr request for %s-%s DONE", req->nameSpace.data,
req->className.data));
diff --git a/sfcBroker.c b/sfcBroker.c
index 7a62a25..d45c1eb 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -161,6 +161,10 @@ stopNextAdapter()
return 0;
}
+/* 3497096 :77022 */
+extern pthread_mutex_t syncMtx; /* syncronize provider state */
+extern int prov_rdy_state; /* -1 indicates not ready */
+
static pthread_mutex_t sdMtx = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t sdCnd = PTHREAD_COND_INITIALIZER;
static int stopping = 0;
@@ -170,11 +174,34 @@ static void
stopBroker(void *p)
{
struct timespec waitTime;
- int rc,
- sa = 0,
- sp = 0;
+ int rc,sa=0,sp=0, count = 0;
+
+ /* SF 3497096 bugzilla 77022 */
+ /* stopping is set to prevent other threads calling this routine */
+ pthread_mutex_lock(&syncMtx);
+ if (stopping) {
+ printf("Stopping sfcb is in progress. Please wait...\n");
+ pthread_mutex_unlock(&syncMtx);
+ return;
+ }
+ else {
+ stopping=1;
+ pthread_mutex_unlock(&syncMtx);
+ }
- stopping = 1;
+ /* Look for providers ready status. A 5 seconds wait is performed to
+ * avoid a hang here in the event of provider looping, crashing etc
+ */
+ for (;;) {
+ pthread_mutex_lock(&syncMtx);
+ if (prov_rdy_state == -1) {
+ if (count >= 5) break; /* lock will be released later */
+ pthread_mutex_unlock(&syncMtx);
+ sleep(1);
+ count++;
+ }
+ else break; /* lock will be released later */
+ }
stopLocalConnectServer();
@@ -182,7 +209,7 @@ stopBroker(void *p)
if (adaptersStopped == 0) {
pthread_mutex_lock(&sdMtx);
- waitTime.tv_sec = time(NULL) + 5;
+ waitTime.tv_sec = time(NULL) + 1; //5
waitTime.tv_nsec = 0;
if (sa == 0)
fprintf(stderr, "--- Stopping adapters\n");
@@ -200,7 +227,7 @@ stopBroker(void *p)
if (adaptersStopped) {
pthread_mutex_lock(&sdMtx);
- waitTime.tv_sec = time(NULL) + 5;
+ waitTime.tv_sec = time(NULL) + 1; //5
waitTime.tv_nsec = 0;
if (sp == 0)
fprintf(stderr, "--- Stopping providers\n");
@@ -220,10 +247,12 @@ stopBroker(void *p)
uninitProvProcCtl();
uninitSocketPairs();
sunsetControl();
- // uninitGarbageCollector();
+ uninitGarbageCollector();
closeLogging();
free((void *)sfcBrokerStart);
+ pthread_mutex_unlock(&syncMtx);
+
if (restartBroker) {
char *emsg = strerror(errno);
execvp("sfcbd", restartArgv);
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Narasimha S. <nsh...@us...> - 2012-04-04 12:36:33
|
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 3429a6d00ca9ec7e3c138ddbfcfb767b70bd4301 (commit)
from 0374a6bef3c312ad7ca1c0f0e34ac3655ebbd316 (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 3429a6d00ca9ec7e3c138ddbfcfb767b70bd4301
Author: nsharoff <nsharoff@nsharoff.(none)>
Date: Wed Apr 4 05:34:26 2012 -0700
[ 3416060 ] SIGSEGV in tool_mm_flush()
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index c13c4c1..52d9310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-04 Narasimha Sharoff <nsh...@us...>
+
+ * providerDrv.c, providerMgr.c, providerMgr.h, support.c:
+ [ 3416060 ] SIGSEGV in tool_mm_flush()
+
2012-04-03 Narasimha Sharoff <nsh...@us...>
* providerDrv.c:
diff --git a/providerDrv.c b/providerDrv.c
index 6efac1b..0398ec8 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -328,7 +328,8 @@ testStartedProc(int pid, int *left)
stopped = 1;
(pp + i)->pid = 0;
info = (pp + i)->firstProv;
- pReg->ft->resetProvider(pReg, pid);
+ if (pReg)
+ pReg->ft->resetProvider(pReg, pid);
}
if ((pp + i)->pid != 0)
(*left)++;
@@ -935,6 +936,7 @@ getProcess(ProviderInfo * info, ProviderProcess ** proc)
if (info->pid == 0) {
currentProc = getpid();
+ sigprocmask(SIG_SETMASK, &old_mask, NULL);
setSignal(SIGCHLD, SIG_DFL, 0);
setSignal(SIGTERM, SIG_IGN, 0);
setSignal(SIGHUP, SIG_IGN, 0);
diff --git a/providerMgr.c b/providerMgr.c
index c088608..8516e33 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -990,6 +990,10 @@ processProviderMgrRequests()
_SFCB_ENTER(TRACE_PROVIDERMGR, "processProviderMgrRequests");
+ /* SF:3416060 disable signals during startup */
+ sigfillset(&mask);
+ sigprocmask(SIG_SETMASK, &mask, &old_mask);
+
startUpProvider("root/interop", "$ClassProvider$");
#ifdef SFCB_INCL_INDICATION_SUPPORT
@@ -1001,6 +1005,7 @@ processProviderMgrRequests()
#ifdef HAVE_SLP
startUpProvider("root/interop", "$ProfileProvider$");
#endif
+ sigprocmask(SIG_SETMASK, &old_mask, NULL);
for (;;) {
MgrHandler hdlr;
@@ -1029,8 +1034,10 @@ processProviderMgrRequests()
req->nameSpace.data, req->className.data, req->type,
requestor));
+ sigprocmask(SIG_SETMASK, &mask, &old_mask);
hdlr = mHandlers[req->type];
hdlr.handler(&requestor, req);
+ sigprocmask(SIG_SETMASK, &old_mask, NULL);
_SFCB_TRACE(1,
("--- Mgr request for %s-%s DONE", req->nameSpace.data,
diff --git a/providerMgr.h b/providerMgr.h
index e5e5004..1c4d91a 100644
--- a/providerMgr.h
+++ b/providerMgr.h
@@ -384,6 +384,7 @@ BinResponseHdr **invokeProviders(BinRequestContext * binCtx, int *err,
BinResponseHdr *invokeProvider(BinRequestContext * ctx);
void freeResponseHeaders(BinResponseHdr ** resp,
BinRequestContext * ctx);
+sigset_t mask, old_mask;
#endif
/* MODELINES */
diff --git a/support.c b/support.c
index 3afb052..4eb69f1 100644
--- a/support.c
+++ b/support.c
@@ -748,8 +748,10 @@ init_sfcBroker()
int
uninit_sfcBroker()
{
- if (pReg)
+ if (pReg) {
pReg->ft->release(pReg);
+ pReg = NULL;
+ }
return 0;
}
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Narasimha S. <nsh...@us...> - 2012-04-04 02:26:06
|
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 0374a6bef3c312ad7ca1c0f0e34ac3655ebbd316 (commit)
from 68f6984aa26ed4f884e98827bf1708feb5869eab (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 0374a6bef3c312ad7ca1c0f0e34ac3655ebbd316
Author: nsharoff <nsharoff@nsharoff.(none)>
Date: Tue Apr 3 19:24:49 2012 -0700
Patches for [ 3483200, 3497209, 3498496 ]
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 3cfc362..c13c4c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2012-04-03 Narasimha Sharoff <nsh...@us...>
+ * providerDrv.c:
+ [ 3498496 ] sfcb hangs and fails to respond to CIM requests
+
+ * brokerUpc.c:
+ [ 3497209 ] oom panic: out of memory using fsp indprovider
+
+ * brokerUpc.c:
+ [ 3483200 ] duplicate indication deliveries
+
+2012-04-03 Narasimha Sharoff <nsh...@us...>
+
* indCIMXMLHandler.c, interopProvider.c:
[ 3495060 ] verify filter and handler information during subscription
diff --git a/brokerUpc.c b/brokerUpc.c
index 396ec96..8953a2c 100644
--- a/brokerUpc.c
+++ b/brokerUpc.c
@@ -124,6 +124,7 @@ deliverIndication(const CMPIBroker * mb, const CMPIContext *ctx,
NativeSelectExp *se = activFilters;
while (se) {
+ void *hc = markHeap(); /* 3497209:78376 */
/* Check for matching FROM class */
for (x=0; x<se->qs->fcNext; x++) {
if (CMClassPathIsA(mb, indop, se->qs->fClasses[x], &st)) {
@@ -131,6 +132,7 @@ deliverIndication(const CMPIBroker * mb, const CMPIContext *ctx,
break;
}
}
+ releaseHeap(hc); /* 3497209:78376 - relase objs that are no longer reqd */
if (classMatch && se->exp.ft->evaluate(&se->exp, ind, &st)) {
/*
* apply a propertyfilter in case the query is not "SELECT * FROM
@@ -153,7 +155,10 @@ deliverIndication(const CMPIBroker * mb, const CMPIContext *ctx,
#endif
);
CBInvokeMethod(mb, ctx, op, "_deliver", in, NULL, &st);
+ CMRelease(op);
+ CMRelease(in);
}
+ classMatch = 0; /* 3483200 */
se = se->next;
}
diff --git a/providerDrv.c b/providerDrv.c
index 8533cf0..6efac1b 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -2814,8 +2814,7 @@ deactivateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
IndicationReq *req = (IndicationReq *) hdr;
BinResponseHdr *resp = NULL;
CMPIStatus rci = { CMPI_RC_OK, NULL };
- NativeSelectExp *se = NULL,
- **sef = &activFilters;
+ NativeSelectExp *se = NULL, *prev = NULL;
CMPIObjectPath *path =
relocateSerializedObjectPath(req->objectPath.data);
CMPIContext *ctx = native_new_CMPIContext(MEM_TRACKED, info);
@@ -2837,9 +2836,9 @@ deactivateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
if (info->indicationMI == NULL || activFilters == NULL)
_SFCB_RETURN(resp);
- for (se = activFilters; se; se = se->next) {
+ for (se = activFilters; se; prev = se, se = se->next) {
+ //_SFCB_TRACE(1, ("---- se->filterid:%p, req=>filterid:%p, se:%p, activFilters:%p, prev:%p", se->filterId, req->filterId, se, activFilters, prev));
if (se->filterId == req->filterId) {
- *sef = se->next;
if (activFilters == NULL) {
_SFCB_TRACE(1,
("--- Calling disableIndications %s",
@@ -2872,6 +2871,15 @@ deactivateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
if (rci.rc == CMPI_RC_OK) {
decreaseInUseSem(info->provIds.procId);
resp->rc = 1;
+ /*79580-3498496*/
+ if (prev == NULL) {
+ activFilters = activFilters->next;
+ }
+ else {
+ prev->next = se->next;
+ }
+ _SFCB_TRACE(1, ("---- pid:%d, freeing: %p", currentProc, se));
+ CMRelease((CMPISelectExp *)se);
_SFCB_RETURN(resp);
}
@@ -2880,8 +2888,6 @@ deactivateFilter(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
resp = errorResp(&rci);
_SFCB_RETURN(resp);
}
- sef = &se->next;
- CMRelease((CMPISelectExp*)se);
}
_SFCB_RETURN(resp);
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2012-04-03 21:57:19
|
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 68f6984aa26ed4f884e98827bf1708feb5869eab (commit)
via 7a43072890c1bb0dc18f209d3061791c5b845e30 (commit)
from e6da1a4d2c6d8983f804ac7fa5ed0e00dd37761c (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 68f6984aa26ed4f884e98827bf1708feb5869eab
Merge: 7a43072 e6da1a4
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Apr 3 17:56:28 2012 -0400
Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb
commit 7a43072890c1bb0dc18f209d3061791c5b845e30
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Apr 3 17:55:44 2012 -0400
Correcting tracker title in changelog
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 38c6914..3cfc362 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -207,7 +207,7 @@
[ 3484025 ] Disable indication sequencing
* mlog.c:
- [ 3487675 ] Log message troubles with \n
+ [ 3487675 ] Log messages can be concatenated
* mlog.c, mlog.h, cimcClientSfcbLocal.c, sfcBroker.c, sfcbinst2mof.c:
[ 3488688 ] Don't spawn logger for clients
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
