Menu
▾
▴
[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node ValueObjectWithPathNode.java, 1.1.2.9, 1.1.2.10 QualifiedNodeHandler.java, 1.1.2.18, 1.1.2.19 MultiExpReqNode.java, 1.1.2.8, 1.1.2.9 ExpMethodCallNode.java, 1.1.2.8, 1.1.2.9 AbstractMethodCallNode.java, 1.1.2.9, 1.1.2.10 InstancePathNode.java, 1.1.2.9, 1.1.2.10 QualiDeclNode.java, 1.1.2.10, 1.1.2.11 IMethodResponseNode.java, 1.1.2.9, 1.1.2.10 MultiExpRspNode.java, 1.1.2.9, 1.1.2.10 SimpleExpReqNode.java, 1.1.2.7, 1.1.2.8 IReturnValueNode.java, 1.1.2.9, 1.1.2.10 MultiReqNode.java, 1.1.2.8, 1.1.2.9 MultiRspNode.java, 1.1.2.8, 1.1.2.9 MethodResponseNode.java, 1.1.2.11, 1.1.2.12 ValueObjectWithLocalPathNode.java, 1.1.2.9, 1.1.2.10 ExpParamValueNode.java, 1.1.2.7, 1.1.2.8 ClassPathNode.java, 1.1.2.8, 1.1.2.9 ValueReferenceNode.java, 1.1.2.8, 1.1.2.9 ExpMethodResponseNode.java, 1.1.2.8, 1.1.2.9 NameSpacePathNode.java, 1.1.2.9, 1.1.2.10 SimpleReqNode.java, 1.1.2.8, 1.1.2.9 MessageNode.java, 1.1.2.7, 1.1.2.8 CIMNode.java, 1.1.2.7, 1.1.2.8 SimpleExpRspNode.java, 1.1.2.8, 1.1.2.9 SimpleRspNode.java, 1.1.2.10, 1.1.2.11 LocalInstancePathNode.java, 1.1.2.9, 1.1.2.10 ValueRefArrayNode.java, 1.1.2.9, 1.1.2.10
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node
In directory vz-cvs-3.sog:/tmp/cvs-serv30703/src/org/sblim/cimclient/internal/cimxml/sax/node
Modified Files:
Tag: Experimental
ValueObjectWithPathNode.java QualifiedNodeHandler.java
MultiExpReqNode.java ExpMethodCallNode.java
AbstractMethodCallNode.java InstancePathNode.java
QualiDeclNode.java IMethodResponseNode.java
MultiExpRspNode.java SimpleExpReqNode.java
IReturnValueNode.java MultiReqNode.java MultiRspNode.java
MethodResponseNode.java ValueObjectWithLocalPathNode.java
ExpParamValueNode.java ClassPathNode.java
ValueReferenceNode.java ExpMethodResponseNode.java
NameSpacePathNode.java SimpleReqNode.java MessageNode.java
CIMNode.java SimpleExpRspNode.java SimpleRspNode.java
LocalInstancePathNode.java ValueRefArrayNode.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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- SimpleExpRspNode.java 1 Jun 2009 17:01:10 -0000 1.1.2.8
+++ SimpleExpRspNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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 @@
* 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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- ValueRefArrayNode.java 10 Apr 2009 16:01:10 -0000 1.1.2.9
+++ ValueRefArrayNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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 @@
* 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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- IReturnValueNode.java 2 Sep 2009 20:25:52 -0000 1.1.2.9
+++ IReturnValueNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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
@@ -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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- ExpMethodResponseNode.java 14 Apr 2009 22:21:54 -0000 1.1.2.8
+++ ExpMethodResponseNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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 @@
* 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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- ValueObjectWithLocalPathNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.9
+++ ValueObjectWithLocalPathNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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
@@ -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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- ClassPathNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.8
+++ ClassPathNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- QualifiedNodeHandler.java 29 Jul 2010 18:44:09 -0000 1.1.2.18
+++ QualifiedNodeHandler.java 27 Mar 2012 19:06:32 -0000 1.1.2.19
@@ -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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- SimpleReqNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.8
+++ SimpleReqNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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 @@
* 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.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- CIMNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.7
+++ CIMNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- LocalInstancePathNode.java 1 Jun 2009 17:01:10 -0000 1.1.2.9
+++ LocalInstancePathNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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
@@ -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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- NameSpacePathNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.9
+++ NameSpacePathNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- IMethodResponseNode.java 2 Sep 2009 20:25:52 -0000 1.1.2.9
+++ IMethodResponseNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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 @@
* 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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- MultiExpRspNode.java 14 Apr 2009 22:21:54 -0000 1.1.2.9
+++ MultiExpRspNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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 @@
* 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.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- MessageNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.7
+++ MessageNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- ValueObjectWithPathNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.9
+++ ValueObjectWithPathNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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
@@ -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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- MultiRspNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.8
+++ MultiRspNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- MultiReqNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.8
+++ MultiReqNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- ExpParamValueNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.7
+++ ExpParamValueNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- SimpleExpReqNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.7
+++ SimpleExpReqNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- MultiExpReqNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.8
+++ MultiExpReqNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- AbstractMethodCallNode.java 1 Jun 2009 17:01:10 -0000 1.1.2.9
+++ AbstractMethodCallNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- SimpleRspNode.java 2 Sep 2009 20:25:52 -0000 1.1.2.10
+++ SimpleRspNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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
@@ -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.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- InstancePathNode.java 1 Jun 2009 17:01:10 -0000 1.1.2.9
+++ InstancePathNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- QualiDeclNode.java 1 Jun 2009 17:01:09 -0000 1.1.2.10
+++ QualiDeclNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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
@@ -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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- ValueReferenceNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.8
+++ ValueReferenceNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- ExpMethodCallNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.8
+++ ExpMethodCallNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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,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.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- MethodResponseNode.java 2 Sep 2009 20:25:52 -0000 1.1.2.11
+++ MethodResponseNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.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
@@ -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();
}
/**
|
