From: Dave B. <bla...@us...> - 2013-10-09 17:27:02
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12556/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMXMLParserImpl.java Log Message: 2669 Potential null pointer exception in parseMESSAGE Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- CIMXMLParserImpl.java 9 Oct 2013 17:18:55 -0000 1.54 +++ CIMXMLParserImpl.java 9 Oct 2013 17:27:00 -0000 1.55 @@ -61,6 +61,7 @@ * 2636 2013-05-08 blaschke-oss Nested embedded instances cause CIMXMLParseException * 2640 2013-05-11 blaschke-oss Multiple CDATA parsing broken in DOM parser * 2668 2013-09-24 blaschke-oss Potential null pointer exception in parseCIM + * 2669 2013-09-24 blaschke-oss Potential null pointer exception in parseMESSAGE */ package org.sblim.cimclient.internal.cimxml; @@ -2073,7 +2074,12 @@ // <!ATTLIST MESSAGE %ID;%PROTOCOLVERSION;> Attr idA = (Attr) searchAttribute(pMessageE, "ID"); + if (idA == null) throw new CIMXMLParseException("ID attribute not found!"); String id = idA.getNodeValue(); + + Attr protocolA = (Attr) searchAttribute(pMessageE, "PROTOCOLVERSION"); + if (protocolA == null) throw new CIMXMLParseException( + "PROTOCOLVERSION attribute not found!"); // TODO if (pCimVersion.equals("2.0") && pDtdVersion.equals("2.0")) { |