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 H. <hel...@us...> - 2013-12-11 20:47:20
|
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 d152551df1341473e576da41012951642cab47c8 (commit)
from 39276bfd8d47af9e5f073fbdc9bc0be93c1322f5 (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 d152551df1341473e576da41012951642cab47c8
Author: Dave Heller <hel...@us...>
Date: Wed Dec 11 15:46:25 2013 -0500
[sfcb-tix:#92] indicationDeliveryThreadLimit not properly enforced
-----------------------------------------------------------------------
Summary of changes:
interopProvider.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/interopProvider.c b/interopProvider.c
index 4591289..31b67f5 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -1605,6 +1605,7 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
di->ctx = native_clone_CMPIContext(ctx);
di->hop = CMClone(su->ha->hop, NULL);
di->hin = CMClone(hin, NULL);
+ errno = 0;
if (IND_THREAD_TO > 0) {
availThreadWait.tv_sec = time(NULL) + IND_THREAD_TO;
while ((sem_timedwait(&availThreadsSem, &availThreadWait)) == -1) {
@@ -1619,6 +1620,14 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
else {
sem_wait(&availThreadsSem);
}
+ /*
+ * This is a shortcut, but errno is thread-safe and this could only
+ * be true if set by sem_timedwait().
+ */
+ if (errno == ETIMEDOUT) {
+ _SFCB_TRACE(2,("--- Timedout waiting to create indication delivery thread"));
+ break;
+ }
int pcrc = pthread_create(&ind_thread, &it_attr,&sendIndForDelivery,(void *) di);
_SFCB_TRACE(1,("--- indication delivery thread status: %d", pcrc));
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-12-11 16:31:39
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26060/src/org/sblim/cimclient/doc-files Modified Files: Tag: Experimental history.html Log Message: 2717 Update detailed release history HTML for 2.2.5 Index: history.html =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/history.html,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -u -d -r1.1.2.10 -r1.1.2.11 --- history.html 12 Sep 2013 12:24:04 -0000 1.1.2.10 +++ history.html 11 Dec 2013 16:31:36 -0000 1.1.2.11 @@ -26,6 +26,7 @@ * 2624 2013-03-14 blaschke-oss Update detailed release history HTML for 2.2.2 * 2643 2013-05-30 blaschke-oss Update detailed release history HTML for 2.2.3 * 2661 2013-09-12 blaschke-oss Update detailed release history HTML for 2.2.4 + * 2717 2013-12-11 blaschke-oss Update detailed release history HTML for 2.2.5 --> </head> <body style="background-color: white;"> @@ -49,7 +50,7 @@ <tr><th>Code Stream</th><th>Versions</th><th>Java Version</th><th>State</th> <tr><td>2.0.x</td><td><a href="#201">2.0.1</a>, <a href="#202">2.0.2</a>, <a href="#203">2.0.3</a>, <a href="#204">2.0.4</a>, <a href="#205">2.0.5</a>, <a href="#206">2.0.6</a>, <a href="#207">2.0.7</a>, <a href="#208">2.0.8</a>, <a href="#209">2.0.9</a></td><td>1.4</td><td>Maintenance mode December 2008, sunset December 2010</td> <tr><td>2.1.x</td><td><a href="#210">2.1.0</a>, <a href="#211">2.1.1</a>, <a href="#212">2.1.2</a>, <a href="#213">2.1.3</a>, <a href="#214">2.1.4</a>, <a href="#215">2.1.5</a>, <a href="#216">2.1.6</a>, <a href="#217">2.1.7</a>, <a href="#218">2.1.8</a>, <a href="#219">2.1.9</a>, <a href="#2110">2.1.10</a>, <a href="#2111">2.1.11</a>, <a href="#2112">2.1.12</a></td><td>1.5</td><td>Maintenance mode September 2012</td> - <tr><td>2.2.x</td><td><a href="#220">2.2.0</a>, <a href="#221">2.2.1</a>, <a href="#222">2.2.2</a>, <a href="#223">2.2.3</a>, <a href="#224">2.2.4</a></td><td>1.5</td><td>Active</td> + <tr><td>2.2.x</td><td><a href="#220">2.2.0</a>, <a href="#221">2.2.1</a>, <a href="#222">2.2.2</a>, <a href="#223">2.2.3</a>, <a href="#224">2.2.4</a>, <a href="#225">2.2.5</a></td><td>1.5</td><td>Active</td> </table> <p>The SBLIM CIM Client for Java continues to ship on a quarterly basis, as close as possible to the middle (15th) of the last month of each @@ -60,6 +61,95 @@ SourceForge will forward requests for the old (Classic) bug IDs to the new (Allura) IDs for some indeterminate amount of time, so to be safe both links are included below, where appropriate.</p> + <a name="225"><h2>Version 2.2.5</h2></a> + <p>Version 2.2.5 was released on December 13, 2013. + It is fully compliant with the final DSP0201 2.4 (Representation of + CIM in XML) specification and with the updated final JSR48 1.0.0 + specification (documentation changes only). It contains two new + features:</p> + <ul> + <li>Two new Java properties - sblim.wbem.sslClientProtocol and + sblim.wbem.sslListenerProtocol - can be used to set the protocol + used for SSLContext.getInstance(String protocol) by a client or + listener. (#2647)</li> + <li>One new Java property - + sblim.wbem.cimxmlParser.allowEmptyLocalNameSpacePath - can be used + to have the client allow LOCALNAMESPACEPATH elements without + NAMESPACE child elements in incoming responses. (#2711)</li> + </ul> + <p>Version 2.2.5 also contains five changes that might affect existing + applications:</p> + <ul> + <li>Three internal APIs - CIMXMLParserImpl.parseNAMESPACE, + parseClassName and parseCLASSNAME - now throw the + CIMXMLParseException. (#2670)</li> + <li>The internal API CIMXMLBuilderImpl.createMETHODCALL now only + has three parameters, pParamtype is not needed. (#2689)</li> + <li>Two internal APIs - Node.getParamType and + CIMObjectFactory.getType - now throw the SAXException. (#2693)</li> + <li>One internal API - PropertyNode.childValueNodeParsed - + now throws the SAXException. (#2700)</li> + <li>One internal API - PropertyArrayNode.childValueNodeParsed - + now throws the SAXException. (#2701)</li> + </ul> + <p>The complete list of changes follows:</p> + <table border="1" cellpadding="5" cellspacing="0" width="100%"> + <tr><th>Classic Bug ID</th><th>Allura Bug ID</th><th>Bug Summary</th></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2666/">2666</a></td><td>CR12: Remove ENUMERATIONCONTEXT</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2668/">2668</a></td><td>Potential null pointer exception in parseCIM<td></td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2669/">2669</a></td><td>Potential null pointer exception in parseMESSAGE</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2670/">2670</a></td><td>NAME attribute not required by DOM parser</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2671/">2671</a></td><td>Potential null pointer exception in parseERROR</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2672/">2672</a></td><td>Remove SIMPLEREQACK support</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2673/">2673</a></td><td>NameSpaceNode does not need testCompletness()</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2674/">2674</a></td><td>Null pointer exception in CIMDateTime(String)</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2675/">2675</a></td><td>CIMXMLParseException messages should contain element name</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2676/">2676</a></td><td>parseMULTI(EXP)REQ looking for wrong child elements</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2677/">2677</a></td><td>ObjectPathNode allows all child nodes</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2678/">2678</a></td><td>parseMULTI___ allows one SIMPLE___ child element</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2679/">2679</a></td><td>parseIMETHODCALL requires one IPARAMVALUE child element</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2680/">2680</a></td><td>IPARAMVALUE parsing broken on DOM/6633SAX</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2681/">2681</a></td><td>parseQUALIFIERDECLARATION does not require TYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2682/">2682</a></td><td>(I)MethodCallNode allows no LOCAL*PATH</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2683/">2683</a></td><td>KEYVALUE VALUETYPE optional, "string" default</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2684/">2684</a></td><td>parseEXPMETHODRESPONSE has several issues</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2685/">2685</a></td><td>Element.getAttribute returns empty string if no attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2686/">2686</a></td><td>parseEXPPARAMVALUE allows 2+ children, prohibits 0</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2687/">2687</a></td><td>ExpParamValueNode allows VALUE, (I)METHODRESPONSE children</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2688/">2688</a></td><td>parseMETHODCALL looks for CIMName attribute instead of NAME</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2689/">2689</a></td><td>createMETHODCALL should not add PARAMTYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2690/">2690</a></td><td>Remove RESPONSEDESTINATION support</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3569106&group_id=128809&atid=712784">3569106</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2537/">2537</a></td><td>CR03: Add new data types for PARAMVALUE</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2691/">2691</a></td><td>RETURNVALUE should not require PARAMTYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2693/">2693</a></td><td>ReturnValueNode allows invalid PARAMTYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2694/">2694</a></td><td>NAME attribute not required by DOM parser (part 2)</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2695/">2695</a></td><td>parseMETHODCALL allows LOCALCLASSPATH and LOCALINSTANCEPATH</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2696/">2696</a></td><td>parseIRETURNVALUE ignores VALUE and VALUE.ARRAY</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2697/">2697</a></td><td>(I)MethodResponseNode allows ERROR with PARAMVALUE</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2699/">2699</a></td><td>parseQUALIFIER does not require TYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2700/">2700</a></td><td>PROPERTY does not require TYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2701/">2701</a></td><td>PROPERTY.ARRAY does not require TYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2702/">2702</a></td><td>Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2703/">2703</a></td><td>MethodNode should not require TYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2704/">2704</a></td><td>PARAMETER does not require TYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2705/">2705</a></td><td>PARAMETER.ARRAY does not require TYPE attribute</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2706/">2706</a></td><td>Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2707/">2707</a></td><td>INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2708/">2708</a></td><td>CIMNode quietly ignores DECLARATION child</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2710/">2710</a></td><td>parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2711/">2711</a></td><td>LOCALNAMESPACEPATH allows 0 NAMESPACE children</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2709/">2709</a></td><td>Lower the level of the EOF message to FINE</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2712/">2712</a></td><td>SimpleReqNode allows any CIM element as child</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2713/">2713</a></td><td>Enforce loose validation of CIM-XML documents</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2714/">2714</a></td><td>Add detailed CIM-XML parser test based on DSP0201 2.4</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2715/">2715</a></td><td>Add VALUE.NULL support</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3569111&group_id=128809&atid=712784">3569111</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2538/">2538</a></td><td>CR14: Support new CORRELATOR element</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2718/">2718</a></td><td>Bad CIMStatusCode generates NumberFormatException</td></tr> + <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3600970&group_id=128809&atid=712784">3600970</a></td><td><a href="http://sourceforge.net/p/sblim/bugs/2594/">2594</a></td><td>CR28: Support CIMErrorDescription HTTP field</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2719/">2719</a></td><td>TCK: CIM APIs should not generate NullPointerException</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2719/">2716</a></td><td>Sync up javax.* javadoc with JSR48 1.0.0 Final V</td></tr> + <tr><td> </td><td><a href="http://sourceforge.net/p/sblim/bugs/2717/">2717</a></td><td>Update detailed release history HTML for 2.2.5</td></tr> + </table> <a name="224"><h2>Version 2.2.4</h2></a> <p>Version 2.2.4 was released on September 13, 2013. It contains three new features:</p> |
|
From: Dave B. <bla...@us...> - 2013-12-11 16:19:19
|
Update of /cvsroot/sblim/jsr48-client/src/javax/cim In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23307/src/javax/cim Modified Files: Tag: Experimental UnsignedInteger64.java UnsignedInteger32.java CIMObjectPath.java CIMValuedElement.java CIMClass.java UnsignedInteger16.java CIMDateTimeInterval.java UnsignedInteger8.java CIMDateTimeAbsolute.java CIMElement.java Log Message: 2716 Sync up javax.* javadoc with JSR48 1.0.0 Final V Index: CIMDateTimeInterval.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMDateTimeInterval.java,v retrieving revision 1.5.2.21 retrieving revision 1.5.2.22 diff -u -d -r1.5.2.21 -r1.5.2.22 --- CIMDateTimeInterval.java 11 Oct 2013 10:12:42 -0000 1.5.2.21 +++ CIMDateTimeInterval.java 11 Dec 2013 16:19:16 -0000 1.5.2.22 @@ -32,6 +32,7 @@ * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods * 2674 2013-09-26 blaschke-oss Null pointer exception in CIMDateTime(String) + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -39,7 +40,7 @@ import org.sblim.cimclient.internal.cim.DTStringReader; import org.sblim.cimclient.internal.cim.DTStringWriter; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents the datetime data type when used as a time value as * specified by the Distributed Management Task Force (<a @@ -118,6 +119,7 @@ * @param pMicroseconds * Number of microseconds in the interval (-1 - 999999). * @throws IllegalArgumentException + * If any value is not valid. */ public CIMDateTimeInterval(int pDays, int pHours, int pMinutes, int pSeconds, int pMicroseconds) throws IllegalArgumentException { @@ -192,7 +194,7 @@ * @param pIntervalString * A string in the format of ddddddddHHMMSS.mmmmmm:000. * @throws IllegalArgumentException - * If string is not in the correct format. + * If string is not in the correct format or <code>null</code>. */ public CIMDateTimeInterval(String pIntervalString) throws IllegalArgumentException { if (pIntervalString == null) throw new IllegalArgumentException( Index: UnsignedInteger32.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger32.java,v retrieving revision 1.4.2.12 retrieving revision 1.4.2.13 diff -u -d -r1.4.2.12 -r1.4.2.13 --- UnsignedInteger32.java 10 Dec 2013 20:28:52 -0000 1.4.2.12 +++ UnsignedInteger32.java 11 Dec 2013 16:19:14 -0000 1.4.2.13 @@ -22,11 +22,12 @@ * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents an <code>UnsignedInteger32</code>. A * <code>uint32</code> data type is defined by the (<a @@ -88,6 +89,8 @@ * The string to be represented as an unsigned 32-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger32(String pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); @@ -103,6 +106,11 @@ * The Object to be compared. * @return A negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public int compareTo(UnsignedInteger32 pOther) { if (pOther == null) throw new IllegalArgumentException( Index: CIMElement.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMElement.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 --- CIMElement.java 15 Sep 2011 22:13:05 -0000 1.3.2.12 +++ CIMElement.java 11 Dec 2013 16:19:16 -0000 1.3.2.13 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2011 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -22,13 +22,14 @@ * 2795671 2009-05-22 raman_arora Add Type to Comparable <T> * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 3410126 2011-09-15 blaschke-oss TCK: CIM element name cannot be null + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; import java.io.Serializable; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * <code>CIMElement</code> is an abstract base class that represents a CIM * Element as defined by the Distributed Management Task Force (<a @@ -47,6 +48,8 @@ * * @param pName * The string for the name of the element. + * @throws IllegalArgumentException + * If name is <code>null</code>. */ public CIMElement(String pName) { if (pName == null) throw new IllegalArgumentException("CIM element name cannot be null"); Index: CIMClass.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMClass.java,v retrieving revision 1.9.2.21 retrieving revision 1.9.2.22 diff -u -d -r1.9.2.21 -r1.9.2.22 --- CIMClass.java 10 Dec 2013 19:16:22 -0000 1.9.2.21 +++ CIMClass.java 11 Dec 2013 16:19:15 -0000 1.9.2.22 @@ -32,6 +32,7 @@ * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -44,7 +45,7 @@ import org.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; import org.sblim.cimclient.internal.util.MOF; -//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents a CIM class as defined by the Distributed Management * Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM Infrastructure @@ -101,6 +102,9 @@ * @param pIsKeyed * <code>true</code> if the CIM class has Keys, * <code>false</code> otherwise. + * @throws IllegalArgumentException + * If pPath is null. + * */ public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier<?>[] pQualifiers, CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods, boolean pIsAssociation, @@ -140,6 +144,8 @@ * List of properties of the CIM class. * @param pMethods * List of methods of the CIM class. + * @throws IllegalArgumentException + * If pName is null. */ public CIMClass(String pName, String pSuperClass, CIMQualifier<?>[] pQualifiers, CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods) { Index: CIMValuedElement.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMValuedElement.java,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -u -d -r1.6.2.10 -r1.6.2.11 --- CIMValuedElement.java 20 Sep 2011 15:53:14 -0000 1.6.2.10 +++ CIMValuedElement.java 11 Dec 2013 16:19:15 -0000 1.6.2.11 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2011 + * (C) Copyright IBM Corp. 2006, 2013 * * 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 @@ * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues * 3411879 2011-09-20 blaschke-oss TCK: CIM element value must match type + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -28,7 +29,7 @@ import org.sblim.cimclient.internal.util.MOF; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * <code>CIMValuedElement</code> is a base class used by any element that * contains a name, type and value. @@ -52,6 +53,8 @@ * @param pValue * The value for this element. <code>null</code> is a valid * value. + * @throws IllegalArgumentException + * If the value does not match the data type. */ protected CIMValuedElement(String pName, CIMDataType pType, E pValue) { super(pName, pType); Index: UnsignedInteger64.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger64.java,v retrieving revision 1.4.2.10 retrieving revision 1.4.2.11 diff -u -d -r1.4.2.10 -r1.4.2.11 --- UnsignedInteger64.java 10 Dec 2013 20:28:52 -0000 1.4.2.10 +++ UnsignedInteger64.java 11 Dec 2013 16:19:14 -0000 1.4.2.11 @@ -21,13 +21,14 @@ * 2935258 2010-01-19 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973230 2010-03-19 blaschke-oss TCK: UnsignedInteger64.equals() does not handle null * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; import java.math.BigInteger; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents an <code>UnsignedInteger64</code>. A * <code>uint64</code> data type is defined by the (<a @@ -77,6 +78,8 @@ * 64-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger64(BigInteger pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("BigInteger value cannot be null!"); @@ -92,6 +95,8 @@ * integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger64(byte[] pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("byte[] value cannot be null!"); @@ -106,6 +111,8 @@ * The string to be represented as an unsigned 64-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger64(String pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); @@ -130,6 +137,11 @@ * The Object to be compared. * @return A negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public int compareTo(UnsignedInteger64 pOther) { if (pOther == null) throw new IllegalArgumentException( Index: CIMObjectPath.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMObjectPath.java,v retrieving revision 1.11.2.25 retrieving revision 1.11.2.26 diff -u -d -r1.11.2.25 -r1.11.2.26 --- CIMObjectPath.java 12 Sep 2013 14:18:14 -0000 1.11.2.25 +++ CIMObjectPath.java 11 Dec 2013 16:19:15 -0000 1.11.2.26 @@ -34,6 +34,7 @@ * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP * 2660 2013-09-04 blaschke-oss CIMObjectPath.equalsModelPath same as equals + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -58,14 +59,15 @@ import org.sblim.cimclient.internal.uri.Value; import org.sblim.cimclient.internal.util.MOF; -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_02) on Sun Apr 22 15:31:53 EDT 2012 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents the CIM Object Path as defined by the Distributed * Management Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM - * Infrastructure Specification (<a - * href=http://www.dmtf.org/standards/published_documents/DSP0004V2.3_final.pdf + * Infrastructure Specification (<a href= + * "http://dmtf.org/sites/default/files/standards/documents/DSP0004_2.7.0.pdf" * >DSP004</a>). In order to uniquely identify a given object, a CIM object path - * includes the namespace, object name and keys (if the object is an instance). <br> + * includes the host, namespace, object name and keys (if the object is an + * instance).<br> * <br> * For example, the object path:<br> * <br> @@ -76,14 +78,23 @@ * <br> * has two parts:<br> * <br> - * <ul type="disc"> <li> <code>http://myserver/root/cimv2</code>- Specifies the - * <code>"root/cimv2"</code> namespace on the host <code>myserver</code>.</li> - * <li> + * <ul type="disc"> <li>Namespace Path</li> + * <code>http://myserver/root/cimv2</code><br> + * JSR48 defines the namespace path to include the scheme, host, port (optional) + * and namespace<br> + * The example specifies the <code>"root/cimv2"</code> namespace on the host + * <code>myserver</code>.</li> <li>Model Path</li> * <code>My_ComputerSystem.Name=mycomputer,CreationClassName=My_ComputerSystem - * </code> - Specifies a <code>My_ComputerSystem</code> object which is - * uniquely identified by two key properties and their corresponding values in - * the format (key=value): <ul type="disc"> <li><code>Name=mycomputer</code></li> - * <li><code>CreationClassName=My_ComputerSystem</code></li> </ul> </li> </ul> + * </code><br> + * DSP0004 defines the model path for a class or qualifier type as the name of + * the class/qualifier type<br> + * DSP0004 defines the model path for an instance as the class + * name.(key=value),*<br> + * The example specifies an instance for the class + * <code>My_ComputerSystem</code> which is uniquely identified by two key + * properties and values: <ul type="disc"> <li><code>Name=mycomputer</code></li> + * <li> + * <code>CreationClassName=My_ComputerSystem</code></li> </ul> </ul> */ public class CIMObjectPath extends Object implements Serializable { @@ -514,7 +525,10 @@ } /** - * Compares this model path with the specified model path for equality. + * Compares this model path with the specified model path for equality. If + * the model path includes references, then the references will also be + * compared for the model path (i.e. the namespace part of the object path + * will be ignored). * * @param pModelPath * The object to compare. Index: UnsignedInteger16.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger16.java,v retrieving revision 1.4.2.12 retrieving revision 1.4.2.13 diff -u -d -r1.4.2.12 -r1.4.2.13 --- UnsignedInteger16.java 10 Dec 2013 20:28:52 -0000 1.4.2.12 +++ UnsignedInteger16.java 11 Dec 2013 16:19:15 -0000 1.4.2.13 @@ -22,11 +22,12 @@ * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents an <code>UnsignedInteger16</code>. A * <code>uint16</code> data type is defined by the (<a @@ -88,6 +89,8 @@ * The string to be represented as an unsigned 16-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger16(String pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); @@ -103,6 +106,11 @@ * The Object to be compared. * @return A negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public int compareTo(UnsignedInteger16 pOther) { if (pOther == null) throw new IllegalArgumentException( Index: CIMDateTimeAbsolute.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMDateTimeAbsolute.java,v retrieving revision 1.7.2.19 retrieving revision 1.7.2.20 diff -u -d -r1.7.2.19 -r1.7.2.20 --- CIMDateTimeAbsolute.java 26 Sep 2013 23:23:56 -0000 1.7.2.19 +++ CIMDateTimeAbsolute.java 11 Dec 2013 16:19:16 -0000 1.7.2.20 @@ -28,6 +28,7 @@ * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods * 2674 2013-09-26 blaschke-oss Null pointer exception in CIMDateTime(String) + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; @@ -37,7 +38,7 @@ import org.sblim.cimclient.internal.cim.DTStringReader; import org.sblim.cimclient.internal.cim.DTStringWriter; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents the datetime data type when used as a time value as * specified in the CIM Infrastructure specification. It is in the format @@ -99,7 +100,7 @@ * @param pDateTime * A string in the format of yyyyMMddHHmmss.SSSSSSsutc. * @throws IllegalArgumentException - * If string is not in the correct format. + * If string is not in the correct format or <code>null</code>. */ public CIMDateTimeAbsolute(String pDateTime) throws IllegalArgumentException { if (pDateTime == null) throw new IllegalArgumentException("Null DateTime is not allowed!"); Index: UnsignedInteger8.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger8.java,v retrieving revision 1.4.2.13 retrieving revision 1.4.2.14 diff -u -d -r1.4.2.13 -r1.4.2.14 --- UnsignedInteger8.java 10 Dec 2013 20:28:52 -0000 1.4.2.13 +++ UnsignedInteger8.java 11 Dec 2013 16:19:16 -0000 1.4.2.14 @@ -23,11 +23,12 @@ * 2944833 2010-02-08 blaschke-oss Need private setValue in UnsignedInteger8 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V */ package javax.cim; -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 /** * This class represents an <code>UnsignedInteger8</code>. A <code>uint8</code> * data type is defined by the (<a href=http://www.dmtf.org>DMTF</a>) CIM @@ -90,6 +91,8 @@ * The string to be represented as an unsigned 8-bit integer. * @throws NumberFormatException * If the number is out of range. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public UnsignedInteger8(String pValue) throws NumberFormatException { if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); @@ -105,6 +108,11 @@ * The Object to be compared. * @return A negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is <code>null</code>. */ public int compareTo(UnsignedInteger8 pOther) { if (pOther == null) throw new IllegalArgumentException( |
Update of /cvsroot/sblim/jsr48-client/src/javax/cim In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6680/src/javax/cim Modified Files: Tag: Experimental UnsignedInteger16.java UnsignedInteger64.java UnsignedInteger8.java UnsignedInteger32.java Log Message: 2719 TCK: CIM APIs should not generate NullPointerException Index: UnsignedInteger32.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger32.java,v retrieving revision 1.4.2.11 retrieving revision 1.4.2.12 diff -u -d -r1.4.2.11 -r1.4.2.12 --- UnsignedInteger32.java 10 Dec 2013 19:16:22 -0000 1.4.2.11 +++ UnsignedInteger32.java 10 Dec 2013 20:28:52 -0000 1.4.2.12 @@ -90,6 +90,7 @@ * If the number is out of range. */ public UnsignedInteger32(String pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); setValue(Long.parseLong(pValue)); } Index: UnsignedInteger16.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger16.java,v retrieving revision 1.4.2.11 retrieving revision 1.4.2.12 diff -u -d -r1.4.2.11 -r1.4.2.12 --- UnsignedInteger16.java 10 Dec 2013 19:16:22 -0000 1.4.2.11 +++ UnsignedInteger16.java 10 Dec 2013 20:28:52 -0000 1.4.2.12 @@ -90,6 +90,7 @@ * If the number is out of range. */ public UnsignedInteger16(String pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); setValue(Integer.parseInt(pValue)); } Index: UnsignedInteger64.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger64.java,v retrieving revision 1.4.2.9 retrieving revision 1.4.2.10 diff -u -d -r1.4.2.9 -r1.4.2.10 --- UnsignedInteger64.java 10 Dec 2013 19:16:22 -0000 1.4.2.9 +++ UnsignedInteger64.java 10 Dec 2013 20:28:52 -0000 1.4.2.10 @@ -79,7 +79,7 @@ * If the number is out of range. */ public UnsignedInteger64(BigInteger pValue) throws NumberFormatException { - if (pValue == null) throw new NumberFormatException("BigInteger value cannot be null!"); + if (pValue == null) throw new IllegalArgumentException("BigInteger value cannot be null!"); setValue(pValue); } @@ -94,7 +94,7 @@ * If the number is out of range. */ public UnsignedInteger64(byte[] pValue) throws NumberFormatException { - if (pValue == null) throw new NumberFormatException("byte[] value cannot be null!"); + if (pValue == null) throw new IllegalArgumentException("byte[] value cannot be null!"); setValue(new BigInteger(pValue)); } @@ -108,7 +108,7 @@ * If the number is out of range. */ public UnsignedInteger64(String pValue) throws NumberFormatException { - if (pValue == null) throw new NumberFormatException("String value cannot be null!"); + if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); setValue(new BigInteger(pValue)); } Index: UnsignedInteger8.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger8.java,v retrieving revision 1.4.2.12 retrieving revision 1.4.2.13 diff -u -d -r1.4.2.12 -r1.4.2.13 --- UnsignedInteger8.java 10 Dec 2013 19:16:22 -0000 1.4.2.12 +++ UnsignedInteger8.java 10 Dec 2013 20:28:52 -0000 1.4.2.13 @@ -92,6 +92,7 @@ * If the number is out of range. */ public UnsignedInteger8(String pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); setValue(Short.parseShort(pValue)); } |
Update of /cvsroot/sblim/jsr48-client/src/javax/cim In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv700/src/javax/cim Modified Files: Tag: Experimental UnsignedInteger64.java UnsignedInteger32.java CIMClass.java UnsignedInteger16.java UnsignedInteger8.java Log Message: 2719 TCK: CIM APIs should not generate NullPointerException Index: UnsignedInteger32.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger32.java,v retrieving revision 1.4.2.10 retrieving revision 1.4.2.11 diff -u -d -r1.4.2.10 -r1.4.2.11 --- UnsignedInteger32.java 19 Mar 2010 14:42:13 -0000 1.4.2.10 +++ UnsignedInteger32.java 10 Dec 2013 19:16:22 -0000 1.4.2.11 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -21,6 +21,7 @@ * 2795671 2009-05-22 raman_arora Add Type to Comparable <T> * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException */ package javax.cim; @@ -103,6 +104,8 @@ * less than, equal to, or greater than the specified object. */ public int compareTo(UnsignedInteger32 pOther) { + if (pOther == null) throw new IllegalArgumentException( + "Other UnsignedInteger32 cannot be null!"); UnsignedInteger32 that = pOther; long d = this.iValue - that.iValue; if (d == 0) return 0; Index: CIMClass.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMClass.java,v retrieving revision 1.9.2.20 retrieving revision 1.9.2.21 diff -u -d -r1.9.2.20 -r1.9.2.21 --- CIMClass.java 7 Sep 2012 16:40:31 -0000 1.9.2.20 +++ CIMClass.java 10 Dec 2013 19:16:22 -0000 1.9.2.21 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -31,6 +31,7 @@ * 3500619 2012-03-16 blaschke-oss JSR48 1.0.0: CIMClass association/key clean up * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException */ package javax.cim; @@ -154,7 +155,7 @@ */ private CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier<?>[] pQualifiers, CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods) { - super(pPath.getObjectName()); + super(pPath == null ? null : pPath.getObjectName()); this.iObjPath = pPath; this.iSuperClass = pSuperClass; this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers); Index: UnsignedInteger16.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger16.java,v retrieving revision 1.4.2.10 retrieving revision 1.4.2.11 diff -u -d -r1.4.2.10 -r1.4.2.11 --- UnsignedInteger16.java 19 Mar 2010 14:42:13 -0000 1.4.2.10 +++ UnsignedInteger16.java 10 Dec 2013 19:16:22 -0000 1.4.2.11 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -21,6 +21,7 @@ * 2795671 2009-05-22 raman_arora Add Type to Comparable <T> * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException */ package javax.cim; @@ -103,6 +104,8 @@ * less than, equal to, or greater than the specified object. */ public int compareTo(UnsignedInteger16 pOther) { + if (pOther == null) throw new IllegalArgumentException( + "Other UnsignedInteger16 cannot be null!"); UnsignedInteger16 that = pOther; int d = this.iValue - that.iValue; if (d == 0) return 0; Index: UnsignedInteger64.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger64.java,v retrieving revision 1.4.2.8 retrieving revision 1.4.2.9 diff -u -d -r1.4.2.8 -r1.4.2.9 --- UnsignedInteger64.java 19 Mar 2010 14:50:30 -0000 1.4.2.8 +++ UnsignedInteger64.java 10 Dec 2013 19:16:22 -0000 1.4.2.9 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2013 * * 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 @@ * 2795671 2009-05-22 raman_arora Add Type to Comparable <T> * 2935258 2010-01-19 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2973230 2010-03-19 blaschke-oss TCK: UnsignedInteger64.equals() does not handle null + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException */ package javax.cim; @@ -78,6 +79,7 @@ * If the number is out of range. */ public UnsignedInteger64(BigInteger pValue) throws NumberFormatException { + if (pValue == null) throw new NumberFormatException("BigInteger value cannot be null!"); setValue(pValue); } @@ -92,6 +94,7 @@ * If the number is out of range. */ public UnsignedInteger64(byte[] pValue) throws NumberFormatException { + if (pValue == null) throw new NumberFormatException("byte[] value cannot be null!"); setValue(new BigInteger(pValue)); } @@ -105,6 +108,7 @@ * If the number is out of range. */ public UnsignedInteger64(String pValue) throws NumberFormatException { + if (pValue == null) throw new NumberFormatException("String value cannot be null!"); setValue(new BigInteger(pValue)); } @@ -128,6 +132,8 @@ * less than, equal to, or greater than the specified object. */ public int compareTo(UnsignedInteger64 pOther) { + if (pOther == null) throw new IllegalArgumentException( + "Other UnsignedInteger64 cannot be null!"); UnsignedInteger64 that = pOther; int d = this.iValue.compareTo(that.iValue); if (d == 0) return 0; Index: UnsignedInteger8.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/UnsignedInteger8.java,v retrieving revision 1.4.2.11 retrieving revision 1.4.2.12 diff -u -d -r1.4.2.11 -r1.4.2.12 --- UnsignedInteger8.java 19 Mar 2010 14:42:13 -0000 1.4.2.11 +++ UnsignedInteger8.java 10 Dec 2013 19:16:22 -0000 1.4.2.12 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2013 * * 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 @@ * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 * 2944833 2010-02-08 blaschke-oss Need private setValue in UnsignedInteger8 * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException */ package javax.cim; @@ -105,6 +106,8 @@ * less than, equal to, or greater than the specified object. */ public int compareTo(UnsignedInteger8 pOther) { + if (pOther == null) throw new IllegalArgumentException( + "Other UnsignedInteger8 cannot be null!"); UnsignedInteger8 that = pOther; int d = this.iValue - that.iValue; if (d == 0) return 0; |
|
From: Dave B. <bla...@us...> - 2013-12-10 16:22:02
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7285/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMXMLParserImpl.java Log Message: 2715 Add VALUE.NULL support Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- CIMXMLParserImpl.java 9 Dec 2013 10:33:42 -0000 1.85 +++ CIMXMLParserImpl.java 10 Dec 2013 16:22:00 -0000 1.86 @@ -92,6 +92,7 @@ * 2710 2013-11-13 blaschke-oss parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child * 2711 2013-11-13 blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children * 2713 2013-11-22 blaschke-oss Enforce loose validation of CIM-XML documents + * 2715 2013-11-26 blaschke-oss Add VALUE.NULL support */ package org.sblim.cimclient.internal.cimxml; @@ -245,19 +246,27 @@ * value is always String[], the caller method have to convert it. * @throws CIMXMLParseException */ - @SuppressWarnings("null") public static TypedValue parseVALUEARRAY(Element pValueArrayE) throws CIMXMLParseException { - // <! ELEMENT VALUE.ARRAY (VALUE*)> + // <! ELEMENT VALUE.ARRAY (VALUE|VALUE.NULL)*> String typeStr = attribute(pValueArrayE, "TYPE"); CIMDataType type = typeStr == null ? null : parseArrayTypeStr(typeStr); - Element[] valueEA = searchNodes(pValueArrayE, "VALUE"); - String[] strA = new String[valueEA == null ? 0 : valueEA.length]; - for (int i = 0; i < strA.length; i++) { - Element valueE = valueEA[i]; - String valueStr = (String) parseVALUE(valueE).getValue(); - strA[i] = valueStr; + + // Process node list here, order of VALUE/VALUE.NULL IS important + NodeList nl = pValueArrayE.getChildNodes(); + if (nl == null || nl.getLength() == 0) return new TypedValue(type, new String[0]); + Vector<String> resStringV = new Vector<String>(); + for (int i = 0; i < nl.getLength(); i++) { + Node n = nl.item(i); + if (n instanceof Text && "".equalsIgnoreCase(n.getNodeValue().trim())) continue; + String name = n.getNodeName(); + if (name.equals("VALUE")) { + resStringV.add((String) parseVALUE((Element) n).getValue()); + } else if (name.equals("VALUE.NULL")) { + resStringV.add(null); + } else if (NODENAME_HASH.containsKey(name)) { throw new CIMXMLParseException( + "VALUE.ARRAY element contains invalid child element " + name + "!"); } } - return new TypedValue(type, strA); + return new TypedValue(type, resStringV.toArray(new String[0])); } /** @@ -337,18 +346,27 @@ * @return CIMObjectPath[] * @throws CIMXMLParseException */ - @SuppressWarnings("null") public static CIMObjectPath[] parseVALUEREFARRAY(Element pValueRefArrayE) throws CIMXMLParseException { - // <! ELEMENT VALUE.REFARRAY (VALUE.REFERENCE*)> - Element[] valueRefElementA = searchNodes(pValueRefArrayE, "VALUE.REFERENCE"); - CIMObjectPath[] resA = new CIMObjectPath[valueRefElementA == null ? 0 - : valueRefElementA.length]; - for (int i = 0; i < resA.length; i++) { - Element valueRefE = valueRefElementA[i]; - resA[i] = parseVALUEREFERENCE(valueRefE); + // <! ELEMENT VALUE.REFARRAY (VALUE.REFERENCE|VALUE.NULL)*> + + // Process node list here, order of VALUE.REFERENCE/VALUE.NULL IS + // important + NodeList nl = pValueRefArrayE.getChildNodes(); + if (nl == null || nl.getLength() == 0) return new CIMObjectPath[0]; + Vector<CIMObjectPath> resObjectPathV = new Vector<CIMObjectPath>(); + for (int i = 0; i < nl.getLength(); i++) { + Node n = nl.item(i); + if (n instanceof Text && "".equalsIgnoreCase(n.getNodeValue().trim())) continue; + String name = n.getNodeName(); + if (name.equals("VALUE.REFERENCE")) { + resObjectPathV.add(parseVALUEREFERENCE((Element) n)); + } else if (name.equals("VALUE.NULL")) { + resObjectPathV.add(null); + } else if (NODENAME_HASH.containsKey(name)) { throw new CIMXMLParseException( + "VALUE.REFARRAY element contains invalid child element " + name + "!"); } } - return resA; + return resObjectPathV.toArray(new CIMObjectPath[0]); } /** @@ -1561,6 +1579,7 @@ private static TypedValue parseSingleValue(Element pElement, int pMask) throws CIMXMLParseException { + boolean foundSingleValue = false; String typeStr = attribute(pElement, "TYPE"); // ebak: there was an ESS fix in the base implementation if (typeStr == null) typeStr = attribute(pElement, "PARAMTYPE"); @@ -1573,18 +1592,20 @@ String valueStr = (String) tVal.getValue(); type = typeStr == null ? tVal.getType() : parseScalarTypeStr(typeStr); value = createJavaObject(type == null ? null : type.toString(), valueStr); + foundSingleValue = true; } } - if (type == null && (pMask & VALUEREF) > 0) { + if (!foundSingleValue && (pMask & VALUEREF) > 0) { // VALUE.REFERENCE Element valuereferenceE = (Element) searchFirstNode(pElement, "VALUE.REFERENCE"); if (valuereferenceE != null) { CIMObjectPath op = parseVALUEREFERENCE(valuereferenceE); value = op; type = new CIMDataType(op.getObjectName()); + foundSingleValue = true; } } - if (type == null && (pMask & VALUEA) > 0) { + if (!foundSingleValue && (pMask & VALUEA) > 0) { // VALUE.ARRAY Element valuearrayE = (Element) searchFirstNode(pElement, "VALUE.ARRAY"); if (valuearrayE != null) { @@ -1599,18 +1620,20 @@ } value = values; } + foundSingleValue = true; } } - if (type == null && (pMask & VALUEREFA) > 0) { + if (!foundSingleValue && (pMask & VALUEREFA) > 0) { // VALUE.REFARRAY Element valueRefArrayE = (Element) searchFirstNode(pElement, "VALUE.REFARRAY"); if (valueRefArrayE != null) { - type = parseArrayTypeStr(typeStr); + type = new CIMDataType("", 0); CIMObjectPath[] opA = parseVALUEREFARRAY(valueRefArrayE); value = opA; + foundSingleValue = true; } } - if (type == null) { + if (!foundSingleValue) { if (value instanceof Object[]) type = CIMDataType.STRING_ARRAY_T; else if (value != null) type = CIMDataType.STRING_T; else type = CIMDataType.STRING_T; // /throw new @@ -2465,18 +2488,16 @@ // VALUE.ARRAY sub elements if (searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null || searchNodes(pParamValueE, "VALUE.REFARRAY", 0, 1, false) != null) { - TypedValue typedValue = parseSingleValue(pParamValueE, VALUEREF); + TypedValue typedValue = parseSingleValue(pParamValueE, VALUEREF | VALUEREFA); CIMDataType type = typedValue.getType(); Object value = typedValue.getValue(); if (type == null) throw new CIMXMLParseException("PARAMVALUE element type is null!"); - checkOtherNodes(pParamValueE, nodesPARAMVALUE); return new CIMArgument<Object>(name, type, value); } if (searchNodes(pParamValueE, "VALUE", 0, 1, false) != null || searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null || !hasNodes(pParamValueE)) { EmbObjHandler embObjHandler = new EmbObjHandler(pParamValueE); - checkOtherNodes(pParamValueE, nodesPARAMVALUE); return new CIMArgument<Object>(name, embObjHandler.getType(), embObjHandler.getValue()); } |
|
From: Dave B. <bla...@us...> - 2013-12-09 10:46:23
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19144/utst/org/sblim/cimclient/unittest/wbem Added Files: DSP0201Test.java Log Message: Add detailed CIM-XML parser test based on DSP0201 2.4 --- NEW FILE: DSP0201Test.java --- /** * (C) Copyright IBM Corp. 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE * CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. * * You can obtain a current copy of the Eclipse Public License from * http://www.opensource.org/licenses/eclipse-1.0.php * * @author : Dave Blaschke, bla...@us... * * Flag Date Prog Description * ------------------------------------------------------------------------------- * 2714 2013-11-22 blaschke-oss Add detailed CIM-XML parser test based on DSP0201 2.4 */ package org.sblim.cimclient.unittest.wbem; import java.io.ByteArrayInputStream; [...1883 lines suppressed...] msg.append(" parser "); msg.append((pGroup & (TEST_VALREQ | TEST_VALRSP)) > 0 ? "valid" : "invalid"); msg.append(" CIM-XML "); msg.append((pGroup & (TEST_VALREQ | TEST_INVALREQ)) > 0 ? "request" : "response"); if (pCIMXML != null) { // msg.append("; "); // msg.append(pCIMXML); } if (e != null) { msg.append("; Exception: "); msg.append(e); if (e.getCause() != null && e.getMessage() != null && !e.getMessage().endsWith(e.getCause().getMessage())) { msg.append("; Cause: "); msg.append(e.getCause()); } } return msg.toString(); } } |
|
From: Dave B. <bla...@us...> - 2013-12-09 10:33:44
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18414 Modified Files: NEWS Log Message: 2713 Enforce loose validation of CIM-XML documents Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.416 retrieving revision 1.417 diff -u -d -r1.416 -r1.417 --- NEWS 3 Dec 2013 14:06:16 -0000 1.416 +++ NEWS 9 Dec 2013 10:33:42 -0000 1.417 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2713 Enforce loose validation of CIM-XML documents 2712 SimpleReqNode allows any CIM element as child 2709 Lower the level of the EOF message to FINE 2711 LOCALNAMESPACEPATH allows 0 NAMESPACE children |
|
From: Dave B. <bla...@us...> - 2013-12-03 14:06:18
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17740/src/org/sblim/cimclient/internal/cimxml/sax/node Modified Files: SimpleReqNode.java Log Message: 2712 SimpleReqNode allows any CIM element as child Index: SimpleReqNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- SimpleReqNode.java 13 Apr 2012 12:59:51 -0000 1.8 +++ SimpleReqNode.java 3 Dec 2013 14:06:16 -0000 1.9 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * 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) * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly + * 2712 2013-11-14 blaschke-oss SimpleReqNode allows any CIM element as child */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -71,6 +72,8 @@ public void testChild(String pNodeNameEnum) throws SAXException { if (this.iMethodCallNode != null) throw new SAXException( "SIMPLEREQ node can have only one child node!"); + if (pNodeNameEnum != IMETHODCALL && pNodeNameEnum != METHODCALL) throw new SAXException( + "SIMPLEREQ node cannot have " + pNodeNameEnum + " child node!"); } @Override |
|
From: Dave B. <bla...@us...> - 2013-11-30 19:17:20
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32599/src/org/sblim/cimclient/internal/wbem Modified Files: Tag: Experimental WBEMClientCIMXML.java Log Message: 2594 CR28: Support CIMErrorDescription HTTP field Index: WBEMClientCIMXML.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v retrieving revision 1.21.2.77 retrieving revision 1.21.2.78 diff -u -d -r1.21.2.77 -r1.21.2.78 --- WBEMClientCIMXML.java 10 Sep 2013 15:51:27 -0000 1.21.2.77 +++ WBEMClientCIMXML.java 30 Nov 2013 19:17:18 -0000 1.21.2.78 @@ -74,6 +74,7 @@ * 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication() * 2651 2013-07-31 blaschke-oss IOException when tracing the cimxml * 2662 2013-09-10 blaschke-oss Need the specific SSLHandshakeException during the cim call + * 2594 2013-11-30 blaschke-oss CR28: Support CIMErrorDescription HTTP field */ package org.sblim.cimclient.internal.wbem; @@ -1879,10 +1880,22 @@ // Benchmark.stopTransportTimer(); - // Look for CIM error, include in exception if it exists + // Look for CIM error and description, include in exception if exists String errorCIM = connection.getHeaderField("CIMError"); + String errorDescriptionCIM = null; if (errorCIM != null) { logger.trace(Level.FINER, "Found CIMError field with value \"" + errorCIM + "\""); + + errorDescriptionCIM = connection.getHeaderField("CIMErrorDescription"); + if (errorDescriptionCIM != null) { + try { + errorDescriptionCIM = URLDecoder.decode(errorDescriptionCIM, "UTF-8"); + } catch (Exception e) { + errorDescriptionCIM = null; + } + logger.trace(Level.FINER, "Found CIMErrorDescription field with value \"" + + errorDescriptionCIM + "\""); + } } // Look for OpenPegasus error details, decode and include in exception @@ -1910,7 +1923,12 @@ + "\""); } - // Format of WBEMException message is: + // If CIMErrorDescription present, format of WBEMException is: + // + // HTTP StatusCode - ReasonPhrase (CIMError: "ErrorString", + // CIMErrorDescription: "ErrorString") + // + // Otherwise, format of WBEMException message is: // // HTTP StatusCode - ReasonPhrase (CIMError: "ErrorString", OpenPegasus // Error: "ErrorString", SFCB Error: "ErrorString") @@ -1922,7 +1940,13 @@ errorMsg.append(connection.getResponseCode()); errorMsg.append(" - "); errorMsg.append(connection.getResponseMessage()); - if (errorCIM != null || errorOP != null || errorSFCB != null) { + if (errorCIM != null && errorDescriptionCIM != null) { + errorMsg.append(" (CIMError: \""); + errorMsg.append(errorCIM); + errorMsg.append("\", CIMErrorDescription: \""); + errorMsg.append(errorDescriptionCIM); + errorMsg.append("\")"); + } else if (errorCIM != null || errorOP != null || errorSFCB != null) { errorMsg.append(" ("); if (errorCIM != null) { errorMsg.append("CIMError: \""); |
|
From: Dave B. <bla...@us...> - 2013-11-29 17:24:25
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/http In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18949/utst/org/sblim/cimclient/unittest/http Modified Files: Tag: Experimental HttpHeaderTest.java Log Message: 2718 Bad CIMStatusCode generates NumberFormatException Index: HttpHeaderTest.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/http/HttpHeaderTest.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -d -r1.1.2.5 -r1.1.2.6 --- HttpHeaderTest.java 27 Feb 2009 14:16:36 -0000 1.1.2.5 +++ HttpHeaderTest.java 29 Nov 2013 17:24:23 -0000 1.1.2.6 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2005, 2009 + * (C) Copyright IBM Corp. 2005, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -16,6 +16,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) * 2641758 2009-02-27 blaschke-oss CIM Client does not recognize HTTP extension headers + * 2718 2013-11-29 blaschke-oss Bad CIMStatusCode generates NumberFormatException */ package org.sblim.cimclient.unittest.http; @@ -60,6 +61,7 @@ } catch (TrailerException e) { verify("Status code", EQUAL, new Integer(e.getWBEMException().getID()), new Integer(1)); + verify("Status description", e.getWBEMException().getMessage() == null); } catch (Exception e) { throw e; } @@ -94,6 +96,7 @@ } catch (TrailerException e) { verify("Status code", EQUAL, new Integer(e.getWBEMException().getID()), new Integer(19)); + verify("Status description", e.getWBEMException().getMessage() == null); } catch (Exception e) { throw e; } @@ -109,6 +112,60 @@ } catch (TrailerException e) { verify("Status code", EQUAL, new Integer(e.getWBEMException().getID()), new Integer(1)); + verify("Status description", e.getWBEMException().getMessage() == null); + } catch (Exception e) { + throw e; + } + } + + { + ByteArrayInputStream stream = new ByteArrayInputStream("12-CIMStatusCode: one\n\n" + .getBytes()); + HttpHeader header = new HttpHeader(stream); + try { + header.examineTrailer(); + fail("No TrailerException thrown on status code 1 with HTTP extension"); + } catch (TrailerException e) { + verify("Status code", EQUAL, new Integer(e.getWBEMException().getID()), + new Integer(1)); + verify("Status description", e.getWBEMException().getMessage() != null + && e.getWBEMException().getMessage().contains("\"one\"")); + } catch (Exception e) { + throw e; + } + } + + { + ByteArrayInputStream stream = new ByteArrayInputStream( + "12-CIMStatusCode: one\n12-CIMStatusCodeDescription: something failed\n\n" + .getBytes()); + HttpHeader header = new HttpHeader(stream); + try { + header.examineTrailer(); + fail("No TrailerException thrown on status code 1 with HTTP extension"); + } catch (TrailerException e) { + verify("Status code", EQUAL, new Integer(e.getWBEMException().getID()), + new Integer(1)); + verify("Status description", "something failed".equalsIgnoreCase(e + .getWBEMException().getMessage())); + } catch (Exception e) { + throw e; + } + } + + { + ByteArrayInputStream stream = new ByteArrayInputStream( + "12-CIMStatusCodeDescription: something failed\n12-CIMStatusCode: one\n\n" + .getBytes()); + HttpHeader header = new HttpHeader(stream); + try { + header.examineTrailer(); + fail("No TrailerException thrown on status code 1 with HTTP extension"); + } catch (TrailerException e) { + verify("Status code", EQUAL, new Integer(e.getWBEMException().getID()), + new Integer(1)); + verify("Status description", "something failed".equalsIgnoreCase(e + .getWBEMException().getMessage())); } catch (Exception e) { throw e; } |
|
From: Dave B. <bla...@us...> - 2013-11-29 13:50:17
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5395/src/org/sblim/cimclient/internal/cimxml Modified Files: Tag: Experimental CIMXMLParserImpl.java Log Message: 2538 CR14: Support new CORRELATOR element Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.14.2.79 retrieving revision 1.14.2.80 diff -u -d -r1.14.2.79 -r1.14.2.80 --- CIMXMLParserImpl.java 26 Nov 2013 17:59:29 -0000 1.14.2.79 +++ CIMXMLParserImpl.java 29 Nov 2013 13:50:14 -0000 1.14.2.80 @@ -93,6 +93,7 @@ * 2711 2013-11-13 blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children * 2713 2013-11-22 blaschke-oss Enforce loose validation of CIM-XML documents * 2715 2013-11-26 blaschke-oss Add VALUE.NULL support + * 2538 2013-11-28 blaschke-oss CR14: Support new CORRELATOR element */ package org.sblim.cimclient.internal.cimxml; @@ -2677,6 +2678,8 @@ throw new CIMXMLParseException("MULTIRSP element missing SIMPLERSP child element!"); } + private static final String nodesSIMPLEREQ[] = { "CORRELATOR", "METHODCALL", "IMETHODCALL" }; + /** * parseSIMPLEREQ * @@ -2685,17 +2688,36 @@ * @throws CIMXMLParseException */ public static CIMRequest parseSIMPLEREQ(Element pSimpleReqE) throws CIMXMLParseException { - // <!ELEMENT SIMPLEREQ (METHODCALL|IMETHODCALL)> + // <!ELEMENT SIMPLEREQ (CORRELATOR*, (METHODCALL | IMETHODCALL))> + CIMRequest request = null; // METHODCALL - Element methodcallA[] = searchNodes(pSimpleReqE, "METHODCALL", 0, 1, false); - if (methodcallA != null) { return parseMETHODCALL(methodcallA[0]); } + Element methodcallA[] = searchNodes(pSimpleReqE, "METHODCALL", 0, 1, true); + if (methodcallA != null) { + request = parseMETHODCALL(methodcallA[0]); + } // IMETHODCALL - Element imethodcallA[] = searchNodes(pSimpleReqE, "IMETHODCALL", 0, 1, false); - if (imethodcallA != null) { return parseIMETHODCALL(imethodcallA[0]); } + Element imethodcallA[] = searchNodes(pSimpleReqE, "IMETHODCALL", 0, 1, true); + if (imethodcallA != null) { + if (request != null) { throw new CIMXMLParseException( + "SIMPLEREQ element cannot have METHODCALL and IMETHODCALL child elements!"); } + request = parseIMETHODCALL(imethodcallA[0]); + } - throw new CIMXMLParseException("SIMPLEREQ element missing required child element!"); + if (request == null) throw new CIMXMLParseException( + "SIMPLEREQ element missing required child element!"); + + // CORRELATOR + Element[] correlatorA = searchNodes(pSimpleReqE, "CORRELATOR", 0, Integer.MAX_VALUE, true); + if (correlatorA != null) { + for (int i = 0; i < correlatorA.length; i++) + // TODO: return to WBEMClient API if JSR48 changes + parseCORRELATOR(correlatorA[i]); + } + + checkOtherNodes(pSimpleReqE, nodesSIMPLEREQ); + return request; } /** @@ -2847,6 +2869,8 @@ return request; } + private static final String nodesSIMPLEEXPREQ[] = { "CORRELATOR", "EXPMETHODCALL" }; + /** * parseSIMPLEEXPREQ * @@ -2855,13 +2879,29 @@ * @throws CIMXMLParseException */ public static CIMRequest parseSIMPLEEXPREQ(Element pSimpleExpReqE) throws CIMXMLParseException { - // <!ELEMENT SIMPLEEXPREQ (METHODRESPONSE)> + // <!ELEMENT SIMPLEEXPREQ (CORRELATOR*, EXPMETHODCALL)> + CIMRequest request = null; // EXPMETHODCALL - Element[] expmethodcallA = searchNodes(pSimpleExpReqE, "EXPMETHODCALL", 1, 1, false); - if (expmethodcallA != null) { return parseEXPMETHODCALL(expmethodcallA[0]); } + Element[] expmethodcallA = searchNodes(pSimpleExpReqE, "EXPMETHODCALL", 1, 1, true); + if (expmethodcallA != null) { + request = parseEXPMETHODCALL(expmethodcallA[0]); + } else { + throw new CIMXMLParseException( + "SIMPLEEXPREQ element missing EXPMETHODCALL child element!"); + } - throw new CIMXMLParseException("SIMPLEEXPREQ element missing EXPMETHODCALL child element!"); + // CORRELATOR + Element[] correlatorA = searchNodes(pSimpleExpReqE, "CORRELATOR", 0, Integer.MAX_VALUE, + true); + if (correlatorA != null) { + for (int i = 0; i < correlatorA.length; i++) + // TODO: return to WBEMClient API if JSR48 changes + parseCORRELATOR(correlatorA[i]); + } + + checkOtherNodes(pSimpleExpReqE, nodesSIMPLEEXPREQ); + return request; } /** @@ -3472,7 +3512,7 @@ "SIMPLEREQ", "SIMPLEEXPREQ", "IMETHODCALL", "METHODCALL", "EXPMETHODCALL", "PARAMVALUE", "IPARAMVALUE", "EXPPARAMVALUE", "MULTIRSP", "MULTIEXPRSP", "SIMPLERSP", "SIMPLEEXPRSP", "METHODRESPONSE", "EXPMETHODRESPONSE", - "IMETHODRESPONSE", "ERROR", "RETURNVALUE", "IRETURNVALUE" }); + "IMETHODRESPONSE", "ERROR", "RETURNVALUE", "IRETURNVALUE", "CORRELATOR" }); } /** @@ -3793,4 +3833,31 @@ return response; } + + private static final String nodesCORRELATOR[] = { "VALUE" }; + + /** + * parseCORRELATOR + * + * @param pCorrelatorE + * @throws CIMXMLParseException + * */ + public static void parseCORRELATOR(Element pCorrelatorE) throws CIMXMLParseException { + // <!ELEMENT CORRELATOR (VALUE)> + // <!ATTLIST CORRELATOR %CIMName; %CIMType; #REQUIRED> + String name = attribute(pCorrelatorE, "NAME"); + if (name == null) throw new CIMXMLParseException( + "CORRELATOR element missing NAME attribute!"); + String type = attribute(pCorrelatorE, "TYPE"); + if (type == null) throw new CIMXMLParseException( + "CORRELATOR element missing TYPE attribute!"); + + // VALUE + Element[] valueA = searchNodes(pCorrelatorE, "VALUE", 1, 1, false); + if (valueA != null) { + // TypedValue tVal = parseVALUE(valueA[0]); + } + + checkOtherNodes(pCorrelatorE, nodesCORRELATOR); + } } |
|
From: Dave B. <bla...@us...> - 2013-11-29 13:50:16
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5395/src/org/sblim/cimclient/internal/cimxml/sax/node Modified Files: Tag: Experimental SimpleExpReqNode.java SimpleReqNode.java Added Files: Tag: Experimental CorrelatorNode.java Log Message: 2538 CR14: Support new CORRELATOR element 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.8 retrieving revision 1.1.2.9 diff -u -d -r1.1.2.8 -r1.1.2.9 --- SimpleExpReqNode.java 27 Mar 2012 19:06:32 -0000 1.1.2.8 +++ SimpleExpReqNode.java 29 Nov 2013 13:50:13 -0000 1.1.2.9 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * 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) * 3511454 2012-03-27 blaschke-oss SAX nodes not reinitialized properly + * 2538 2013-11-28 blaschke-oss CR14: Support new CORRELATOR element */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -28,7 +29,7 @@ import org.xml.sax.SAXException; /** - * ELEMENT SIMPLEEXPREQ (EXPMETHODCALL) + * ELEMENT SIMPLEEXPREQ (CORRELATOR*, EXPMETHODCALL) */ public class SimpleExpReqNode extends AbstractMessageNode { @@ -42,7 +43,11 @@ } public void addChild(Node pChild) { - this.iMethodCallNode = (ExpMethodCallNode) pChild; + if (pChild instanceof ExpMethodCallNode) { + this.iMethodCallNode = (ExpMethodCallNode) pChild; + } else if (pChild instanceof CorrelatorNode) { + // TODO: return to WBEMClient API if JSR48 changes + } } /** @@ -65,11 +70,11 @@ @Override public void testChild(String pNodeNameEnum) throws SAXException { - if (this.iMethodCallNode != null) throw new SAXException(getNodeName() - + " node can have only one child node!"); - if (pNodeNameEnum != EXPMETHODCALL) throw new SAXException(getNodeName() - + " node's child node can be " + EXPMETHODCALL + " only! " + pNodeNameEnum - + " is invalid!"); + if (pNodeNameEnum == EXPMETHODCALL) { + if (this.iMethodCallNode != null) throw new SAXException(getNodeName() + + " node can have only one child node!"); + } else if (pNodeNameEnum != CORRELATOR) throw new SAXException(getNodeName() + + " node cannot have " + pNodeNameEnum + " child node!"); } @Override 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.10 retrieving revision 1.1.2.11 diff -u -d -r1.1.2.10 -r1.1.2.11 --- SimpleReqNode.java 15 Nov 2013 01:21:05 -0000 1.1.2.10 +++ SimpleReqNode.java 29 Nov 2013 13:50:14 -0000 1.1.2.11 @@ -21,6 +21,7 @@ * 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 * 2712 2013-11-14 blaschke-oss SimpleReqNode allows any CIM element as child + * 2538 2013-11-28 blaschke-oss CR14: Support new CORRELATOR element */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -30,7 +31,7 @@ import org.xml.sax.SAXException; /** - * ELEMENT SIMPLEREQ (IMETHODCALL | METHODCALL) + * ELEMENT SIMPLEREQ (CORRELATOR*, (METHODCALL | IMETHODCALL)) */ public class SimpleReqNode extends AbstractMessageNode { @@ -44,7 +45,11 @@ } public void addChild(Node pChild) { - this.iMethodCallNode = (AbstractMethodCallNode) pChild; + if (pChild instanceof AbstractMethodCallNode) { + this.iMethodCallNode = (AbstractMethodCallNode) pChild; + } else if (pChild instanceof CorrelatorNode) { + // TODO: return to WBEMClient API if JSR48 changes + } } /** @@ -70,9 +75,10 @@ */ @Override public void testChild(String pNodeNameEnum) throws SAXException { - if (this.iMethodCallNode != null) throw new SAXException( - "SIMPLEREQ node can have only one child node!"); - if (pNodeNameEnum != IMETHODCALL && pNodeNameEnum != METHODCALL) throw new SAXException( + if (pNodeNameEnum == IMETHODCALL || pNodeNameEnum == METHODCALL) { + if (this.iMethodCallNode != null) throw new SAXException( + "SIMPLEREQ node can have only one child node!"); + } else if (pNodeNameEnum != CORRELATOR) throw new SAXException( "SIMPLEREQ node cannot have " + pNodeNameEnum + " child node!"); } --- NEW FILE: CorrelatorNode.java --- /** * (C) Copyright IBM Corp. 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE * CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. * * You can obtain a current copy of the Eclipse Public License from * http://www.opensource.org/licenses/eclipse-1.0.php * * @author : Dave Blaschke, bla...@us... * * Flag Date Prog Description * ------------------------------------------------------------------------------- * 2538 2013-11-28 blaschke-oss CR14: Support new CORRELATOR element */ package org.sblim.cimclient.internal.cimxml.sax.node; import javax.cim.CIMDataType; import org.sblim.cimclient.internal.cimxml.sax.SAXSession; import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** * <pre> * ELEMENT CORRELATOR (VALUE) * ATTLIST CORRELATOR * %CIMName; * %CIMType; #REQUIRED * </pre> */ public class CorrelatorNode extends Node implements TypedIf, ValueIf { // private String iName; private CIMDataType iType; private Object iValue; private boolean iHasValue; /** * Ctor. */ public CorrelatorNode() { super(CORRELATOR); } /** * @param pSession */ @Override public void init(Attributes pAttribs, SAXSession pSession) throws SAXException { /* this.iName = */getCIMName(pAttribs); this.iType = getCIMType(pAttribs, false); this.iValue = null; this.iHasValue = false; } /** * @param pData */ @Override public void parseData(String pData) { // no data } @Override public void testChild(String pNodeNameEnum) throws SAXException { if (pNodeNameEnum != VALUE) throw new SAXException(pNodeNameEnum + " cannot be the child node of " + getNodeName() + " node!"); if (this.iHasValue) throw new SAXException(getNodeName() + " node can have only one child node!"); } @Override public void childParsed(Node pChild) { if (pChild instanceof ValueNode) this.iHasValue = true; this.iValue = ((ValueNode) pChild).getValue(); } @Override public void testCompletness() throws SAXException { if (!this.iHasValue) throw new SAXException(getNodeName() + " node must have one VALUE child node!"); } public CIMDataType getType() { return this.iType; } public Object getValue() { return this.iValue; } } |
|
From: Dave H. <hel...@us...> - 2013-11-27 16:14: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 39276bfd8d47af9e5f073fbdc9bc0be93c1322f5 (commit)
from 3656589ab63831a8f09a838a310322bfebe9cb13 (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 39276bfd8d47af9e5f073fbdc9bc0be93c1322f5
Author: Dave Heller <hel...@us...>
Date: Wed Nov 27 11:13:10 2013 -0500
[sfcb-tix:#76] remove obsolete patch file
-----------------------------------------------------------------------
Summary of changes:
extra/sfcb-proc-nametags.patch | 133 ----------------------------------------
1 files changed, 0 insertions(+), 133 deletions(-)
diff --git a/extra/sfcb-proc-nametags.patch b/extra/sfcb-proc-nametags.patch
deleted file mode 100644
index 139161e..0000000
--- a/extra/sfcb-proc-nametags.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Process Nametags patch: allows for easy identification of loaded providers
-
-After patching (with -p1), start sfcb like so:
-
-sfcbd xxxxxxxxxxxxxx <sfcbd options...>
-
-"ps a | grep sfcb" will then show:
-
-3450 pts/1 Sl+ 0:00 sfcbd main
-3452 pts/1 S+ 0:00 sfcbd httpd
-3453 pts/1 S+ 0:00 sfcbd ClassProvider
-3455 pts/1 S+ 0:00 sfcbd InteropProvider
-3457 pts/1 S+ 0:00 sfcbd ProfileProvider
-3460 pts/1 S+ 0:00 sfcbd InternalProvide
-3474 pts/1 Sl+ 0:00 sfcbd IndCIMXMLHandle
-
-The number of 'x's supplied determines the length of the "nametag".
-
-Tested and working on x86 with glibc.
-
-
-
-diff --git a/httpAdapter.c b/httpAdapter.c
-index abb0096..d6960f0 100644
---- a/httpAdapter.c
-+++ b/httpAdapter.c
-@@ -130,6 +130,10 @@ extern int inet_aton(const char *cp, struct in_addr *inp);
- static unsigned int sessionId;
- extern char *opsName[];
-
-+// sfcb-proc-nametags.patch
-+char *nametag;
-+int nametaglen;
-+
- typedef int (*Authenticate) (char *principal, char *pwd);
-
- typedef struct _buffer {
-@@ -1164,6 +1168,10 @@ handleHttpRequest(int connFd, int sslMode)
- if (r == 0) {
- currentProc = getpid();
- processName = "CIMXML-Processor";
-+
-+ // sfcb-proc-nametags.patch
-+ strncpy(nametag,processName,nametaglen);
-+
- semRelease(httpProcSem, 0);
- semAcquireUnDo(httpProcSem, 0);
- semReleaseUnDo(httpProcSem, httpProcIdX + 1);
-diff --git a/providerDrv.c b/providerDrv.c
-index 6042093..8ade560 100644
---- a/providerDrv.c
-+++ b/providerDrv.c
-@@ -146,6 +146,10 @@ unsigned long provTimeoutInterval = 25;
- unsigned provAutoGroup = 0;
- static int stopping = 0;
-
-+// sfcb-proc-nametags.patch
-+char * nametag;
-+int nametaglen;
-+
- void uninitProvProcCtl();
- extern void uninitSocketPairs();
- extern void sunsetControl();
-@@ -755,6 +759,9 @@ getProcess(ProviderInfo * info, ProviderProcess ** proc)
-
- if (info->pid == 0) {
-
-+ // sfcb-proc-nametags.patch
-+ strncpy(nametag,info->providerName,nametaglen);
-+
- currentProc = getpid();
- setSignal(SIGCHLD, SIG_DFL, 0);
- setSignal(SIGTERM, SIG_IGN, 0);
-diff --git a/sfcBroker.c b/sfcBroker.c
-index 5c589d8..68e3e22 100644
---- a/sfcBroker.c
-+++ b/sfcBroker.c
-@@ -99,6 +99,10 @@ static int adaptersStopped = 0,
-
- extern char *configfile;
-
-+// sfcb-proc-nametags.patch
-+extern char * nametag; /* this will hold argv[1] if argv[1] = xxxxxxx... */
-+extern int nametaglen; /* the number of x's if above is true */
-+
- typedef struct startedAdapter {
- struct startedAdapter *next;
- int stopped;
-@@ -424,6 +428,8 @@ startHttpd(int argc, char *argv[], int sslMode)
- }
- }
-
-+ // sfcb-proc-nametags.patch
-+ strncpy(nametag,"httpd",nametaglen);
- if (httpDaemon(argc, argv, sslMode)) {
- kill(sfcPid, 3); /* if port in use, shutdown */
- }
-@@ -557,6 +563,14 @@ main(int argc, char *argv[])
- else
- name = argv[0];
-
-+ // sfcb-proc-nametags.patch
-+ if (argc > 1 && strchr(argv[1],'x')) {
-+ nametag = argv[1];
-+ nametaglen = strlen(argv[1]);
-+ memset(nametag, ' ', nametaglen);
-+ strncpy(nametag,"main",nametaglen);
-+ }
-+
- collectStat = 0;
- colorTrace = 0;
- processName = "sfcbd";
-@@ -651,11 +665,12 @@ main(int argc, char *argv[])
- }
- }
-
-- if (optind < argc) {
-- fprintf(stderr, "SFCB not started: unrecognized config property %s\n",
-- argv[optind]);
-- usage(1);
-- }
-+// sfcb-proc-nametags.patch
-+// if (optind < argc) {
-+// fprintf(stderr, "SFCB not started: unrecognized config property %s\n",
-+// argv[optind]);
-+// usage(1);
-+// }
-
- startLogging(syslogLevel);
-
---
-1.6.3.3
-
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-11-27 16:11:52
|
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 3656589ab63831a8f09a838a310322bfebe9cb13 (commit)
from bde75719684c814f23e374ec16459db2333b4e98 (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 3656589ab63831a8f09a838a310322bfebe9cb13
Author: Dave Heller <hel...@us...>
Date: Wed Nov 27 11:10:19 2013 -0500
[sfcb-tix:#76] Use SFCB_LABELPROCS env var instead of labelProcs config
-----------------------------------------------------------------------
Summary of changes:
control.c | 1 -
man/sfcbd.1.pre.in | 9 +++++++++
sfcBroker.c | 19 +++++++++++++++----
sfcb.cfg.pre.in | 11 +----------
4 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/control.c b/control.c
index 0566dfd..1f789ff 100644
--- a/control.c
+++ b/control.c
@@ -124,7 +124,6 @@ void restoreOrigArgv(int removePad) {
/* Control initial values
{ property, type, string value, numeric value} */
static Control init[] = {
- {"labelProcs", CTL_UINT, NULL, {.uint=0}},
{"ip4AddrList", CTL_STRING, NULL, {0}},
{"ip6AddrList", CTL_STRING, NULL, {0}},
{"httpPort", CTL_LONG, NULL, {.slong=5988}},
diff --git a/man/sfcbd.1.pre.in b/man/sfcbd.1.pre.in
index b9833f8..884a361 100644
--- a/man/sfcbd.1.pre.in
+++ b/man/sfcbd.1.pre.in
@@ -248,6 +248,15 @@ platforms to be generated by sfcb in special situations.
.br
[Note: not currently ever used]
.TP
+.B SFCB_LABELPROCS
+If set to a positive integer value, enable the process labeling feature.
+This adds a description of each process' role to the process cmdline
+so that it appears in 'ps' output. The identifying info will be appended
+to the original arv data, following any passed arguments. The number of bytes
+appended is limited by the value of SFCB_LABELPROCS. A value of about 100
+should be enough in most cases. A smaller value may truncate the data, but
+this may be desired. To disable, set the vaue to zero, or unset the env var.
+.TP
.B SBLIM_TRACE
Specifies the level of trace/debug messages for SBLIM providers.
Valid values are 0 (no trace messages), or 1 (key trace messages only)
diff --git a/sfcBroker.c b/sfcBroker.c
index 0f4ed46..5063415 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -655,6 +655,12 @@ main(int argc, char *argv[])
char *pauseStr;
int daemonize=0;
+ /* Note we will see no mlogf() output prior to this flag being set. If the
+ * flag is set but startLogging() has not yet been called, mlogf() will write
+ * to syslog directly. After startLogging(), mlogf() will write through the
+ * the logging facility. */
+ sfcbUseSyslog=1;
+
name = strrchr(argv[0], '/');
if (name != NULL)
++name;
@@ -782,8 +788,15 @@ main(int argc, char *argv[])
currentProc=sfcBrokerPid=getpid(); /* req. on some systems */
}
- setupControl(configfile); /* enable reading the config file */
- if ((getControlUNum("labelProcs", &labelProcs) == 0) && (labelProcs > 0)) {
+ char *envLabelProcs = getenv("SFCB_LABELPROCS");
+ if (envLabelProcs && *envLabelProcs) {
+ char *endptr;
+ long val = strtol(envLabelProcs, &endptr, 10);
+ if ((*endptr =='\0') && (val > 0) && (val < 1024))
+ labelProcs = (unsigned int) val;
+ }
+
+ if (labelProcs) {
if (*argv[argc-1] != 'X') {
/* Create an expanded argv */
char **newArgv = malloc(sizeof(char*) * (argc + 2));
@@ -809,9 +822,7 @@ main(int argc, char *argv[])
exit(1);
}
}
- sunsetControl(); /* ensures setupControl() is re-run after startLogging() */
- sfcbUseSyslog=1;
startLogging(syslogLevel,1);
mlogf(M_NOTICE, M_SHOW, "--- %s V" sfcHttpDaemonVersion " started - %d\n",
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index 41dbfb5..d575a7e 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -313,7 +313,7 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
#slpRefreshInterval: 600
-##------------------------------- Trace and Debug -----------------------------
+##------------------------------------ Trace ----------------------------------
## Location of the trace file.
## Can be overriden by setting environment variable SFCB_TRACE_FILE
@@ -331,15 +331,6 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
## Default is 0. If trace mask is set (by any method) the default is 1.
#traceLevel: 0
-## Label each process by adding identifying information to the process cmdline
-## so that it appears in 'ps' output. The identifying info will be appended to
-## the original argv data, following any passed arguments. The number of bytes
-## appended is limited by the value of labelProcs. A value of about 100 should
-## be enough in most cases. A smaller value may truncate the data, but this may
-## be desired. A value of 0 means the feature is disabled.
-## Default is 0
-#labelProcs: 100
-
##---------------------------- Indications ----------------------------
## Indication provider calls to CBDeliverIndication() cause a thread to spawn
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-11-27 11:56:41
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5013 Modified Files: NEWS Log Message: 2709 Lower the level of the EOF message to FINE Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.414 retrieving revision 1.415 diff -u -d -r1.414 -r1.415 --- NEWS 27 Nov 2013 11:47:39 -0000 1.414 +++ NEWS 27 Nov 2013 11:56:38 -0000 1.415 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2709 Lower the level of the EOF message to FINE 2711 LOCALNAMESPACEPATH allows 0 NAMESPACE children 2710 parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child 2708 CIMNode quietly ignores DECLARATION child |
|
From: Dave B. <bla...@us...> - 2013-11-27 11:47:41
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4536/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMXMLParserImpl.java Log Message: 2711 LOCALNAMESPACEPATH allows 0 NAMESPACE children Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- CIMXMLParserImpl.java 27 Nov 2013 11:24:28 -0000 1.83 +++ CIMXMLParserImpl.java 27 Nov 2013 11:47:39 -0000 1.84 @@ -90,6 +90,7 @@ * 2706 2013-11-11 blaschke-oss Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException * 2707 2013-11-12 blaschke-oss INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children * 2710 2013-11-13 blaschke-oss parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child + * 2711 2013-11-13 blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children */ package org.sblim.cimclient.internal.cimxml; @@ -594,9 +595,11 @@ Element[] nameSpaceElementA = searchNodes(pLocalNameSpaceE, "NAMESPACE"); if (nameSpaceElementA == null) { - if (cLocalPathBuilder == null) throw new CIMXMLParseException( + if (WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath() + && cLocalPathBuilder != null) return cLocalPathBuilder.getBasePath() + .getNamespace(); + throw new CIMXMLParseException( "LOCALNAMESPACEPATH element missing NAMESPACE child element!"); - return cLocalPathBuilder.getBasePath().getNamespace(); } StringBuffer sb = new StringBuffer(); for (int i = 0; i < nameSpaceElementA.length; i++) { |
|
From: Dave B. <bla...@us...> - 2013-11-27 11:24:30
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3381/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMXMLParserImpl.java Log Message: 2710 parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- CIMXMLParserImpl.java 26 Nov 2013 18:15:19 -0000 1.82 +++ CIMXMLParserImpl.java 27 Nov 2013 11:24:28 -0000 1.83 @@ -89,6 +89,7 @@ * 2705 2013-11-11 blaschke-oss PARAMETER.ARRAY does not require TYPE attribute * 2706 2013-11-11 blaschke-oss Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException * 2707 2013-11-12 blaschke-oss INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children + * 2710 2013-11-13 blaschke-oss parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child */ package org.sblim.cimclient.internal.cimxml; @@ -474,14 +475,14 @@ // CLASSPATH Element classpathE = (Element) searchFirstNode(pValueObjectWithPathE, "CLASSPATH"); if (classpathE != null) { - // CIMObjectPath op = parseCLASSPATH(classpathE); + CIMObjectPath op = parseCLASSPATH(classpathE); // CLASS Element classE = (Element) searchFirstNode(pValueObjectWithPathE, "CLASS"); if (classE == null) { throw new CIMXMLParseException( "VALUE.OBJECTWITHPATH element missing CLASS child element!"); } - // TODO parse CLASS with ObjectPath - CIMClass obj = parseCLASS(classE); + + CIMClass obj = parseCLASS(classE, op); return obj; } @@ -518,14 +519,14 @@ Element localclasspathE = (Element) searchFirstNode(pValueObjectWithLocalPathE, "LOCALCLASSPATH"); if (localclasspathE != null) { - // CIMObjectPath op = parseLOCALCLASSPATH(localclasspathE); + CIMObjectPath op = parseLOCALCLASSPATH(localclasspathE); // CLASS Element classE = (Element) searchFirstNode(pValueObjectWithLocalPathE, "CLASS"); if (classE == null) { throw new CIMXMLParseException( "VALUE.OBJECTWITHLOCALPATH element missing CLASS child element!"); } - // TODO parse class with path - CIMClass obj = parseCLASS(classE); + + CIMClass obj = parseCLASS(classE, op); return obj; } @@ -1134,6 +1135,19 @@ * @throws CIMXMLParseException */ public static CIMClass parseCLASS(Element pClassE) throws CIMXMLParseException { + return parseCLASS(pClassE, null); + } + + /** + * parseCLASS + * + * @param pClassE + * @param pObjectPath + * @return CIMClass + * @throws CIMXMLParseException + */ + public static CIMClass parseCLASS(Element pClassE, CIMObjectPath pObjectPath) + throws CIMXMLParseException { // <!ELEMENT CLASS (QUALIFIER*, // (PROPERTY|PROPERTY.ARRAY|PROPERTY.REFERENCE)*,METHOD*)> // <!ATTLIST CLASS %NAME;%SUPERCLASS;> @@ -1178,8 +1192,9 @@ * CIMClassProperty[] props, CIMMethod[] pMethods, boolean * pIsAssociation, boolean pIsKeyed ) */ - return new CIMClass(cLocalPathBuilder.build(name, null), superClass, qualis, props, - methods, hasAssocQuali(qualis), hasKeyProp(props)); + return new CIMClass( + pObjectPath == null ? cLocalPathBuilder.build(name, null) : pObjectPath, + superClass, qualis, props, methods, hasAssocQuali(qualis), hasKeyProp(props)); } private static boolean hasAssocQuali(CIMQualifier<?>[] pQualis) { |
|
From: Dave B. <bla...@us...> - 2013-11-26 18:22:04
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1083 Modified Files: NEWS Log Message: 2708 CIMNode quietly ignores DECLARATION child Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.411 retrieving revision 1.412 diff -u -d -r1.411 -r1.412 --- NEWS 26 Nov 2013 18:15:19 -0000 1.411 +++ NEWS 26 Nov 2013 18:22:01 -0000 1.412 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2708 CIMNode quietly ignores DECLARATION child 2707 INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children 2706 Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException 2705 PARAMETER.ARRAY does not require TYPE attribute |
|
From: Dave B. <bla...@us...> - 2013-11-26 18:15:22
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv632 Modified Files: NEWS Log Message: 2707 INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.410 retrieving revision 1.411 diff -u -d -r1.410 -r1.411 --- NEWS 26 Nov 2013 18:06:15 -0000 1.410 +++ NEWS 26 Nov 2013 18:15:19 -0000 1.411 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2707 INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children 2706 Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException 2705 PARAMETER.ARRAY does not require TYPE attribute 2704 PARAMETER does not require TYPE attribute |
|
From: Dave B. <bla...@us...> - 2013-11-26 18:15:21
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv632/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMXMLParserImpl.java Log Message: 2707 INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- CIMXMLParserImpl.java 26 Nov 2013 18:06:15 -0000 1.81 +++ CIMXMLParserImpl.java 26 Nov 2013 18:15:19 -0000 1.82 @@ -88,6 +88,7 @@ * 2704 2013-11-11 blaschke-oss PARAMETER does not require TYPE attribute * 2705 2013-11-11 blaschke-oss PARAMETER.ARRAY does not require TYPE attribute * 2706 2013-11-11 blaschke-oss Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException + * 2707 2013-11-12 blaschke-oss INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children */ package org.sblim.cimclient.internal.cimxml; @@ -783,7 +784,7 @@ */ public static CIMObjectPath parseINSTANCENAME(Element pInstanceNameE) throws CIMXMLParseException { - // <!ELEMENT INSTANCENAME (KEYBINDING*|KEYVALUE?|VALUE.REFERNCE?)> + // <!ELEMENT INSTANCENAME (KEYBINDING*|KEYVALUE?|VALUE.REFERENCE?)> // <!ATTLIST INSTANCENAME %CLASSNAME;> Attr instance_classnameA = (Attr) searchAttribute(pInstanceNameE, "CLASSNAME"); if (instance_classnameA == null) throw new CIMXMLParseException( @@ -801,6 +802,26 @@ return cLocalPathBuilder.build(opClassName, null, keys); } + // KEYVALUE + Element keyvalueE = (Element) searchFirstNode(pInstanceNameE, "KEYVALUE"); + if (keyvalueE != null) { + CIMProperty<?>[] keys = new CIMProperty[1]; + TypedValue propTypedVal = parseKEYVALUE(keyvalueE); + keys[0] = new CIMProperty<Object>("", propTypedVal.getType(), propTypedVal.getValue(), + true, false, null); + return cLocalPathBuilder.build(opClassName, null, keys); + } + + // VALUE.REFERENCE + Element valuereferenceE = (Element) searchFirstNode(pInstanceNameE, "VALUE.REFERENCE"); + if (valuereferenceE != null) { + CIMProperty<?>[] keys = new CIMProperty[1]; + CIMObjectPath op = parseVALUEREFERENCE(valuereferenceE); + keys[0] = new CIMProperty<CIMObjectPath>("", new CIMDataType(op.getObjectName()), op, + true, false, null); + return cLocalPathBuilder.build(opClassName, null, keys); + } + return new CIMObjectPath(null, null, null, null, opClassName, null); } |
|
From: Dave B. <bla...@us...> - 2013-11-26 18:06:18
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32273 Modified Files: NEWS Log Message: 2706 Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.409 retrieving revision 1.410 diff -u -d -r1.409 -r1.410 --- NEWS 26 Nov 2013 17:55:59 -0000 1.409 +++ NEWS 26 Nov 2013 18:06:15 -0000 1.410 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2706 Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException 2705 PARAMETER.ARRAY does not require TYPE attribute 2704 PARAMETER does not require TYPE attribute 2703 MethodNode should not require TYPE attribute |
|
From: Dave B. <bla...@us...> - 2013-11-26 17:59:32
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31719/src/org/sblim/cimclient/internal/cimxml/sax/node Modified Files: Tag: Experimental ParameterArrayNode.java Log Message: 2705 PARAMETER.ARRAY does not require TYPE attribute Index: ParameterArrayNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -d -r1.1.2.6 -r1.1.2.7 --- ParameterArrayNode.java 11 Nov 2013 22:56:36 -0000 1.1.2.6 +++ ParameterArrayNode.java 26 Nov 2013 17:59:29 -0000 1.1.2.7 @@ -53,7 +53,7 @@ @Override protected void specificInit(Attributes pAttribs) throws SAXException { if (getCIMType(pAttribs, true) == null) throw new SAXException( - "PARAMETER element missing TYPE attribute!"); + "PARAMETER.ARRAY element missing TYPE attribute!"); this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs, this.iSession, this.iQualiHandler, true); } |
|
From: Dave B. <bla...@us...> - 2013-11-26 17:56:01
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31525/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMXMLParserImpl.java Log Message: 2705 PARAMETER.ARRAY does not require TYPE attribute Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- CIMXMLParserImpl.java 26 Nov 2013 17:48:11 -0000 1.79 +++ CIMXMLParserImpl.java 26 Nov 2013 17:55:59 -0000 1.80 @@ -86,6 +86,7 @@ * 2702 2013-11-07 blaschke-oss Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException * 2703 2013-11-08 blaschke-oss MethodNode should not require TYPE attribute * 2704 2013-11-11 blaschke-oss PARAMETER does not require TYPE attribute + * 2705 2013-11-11 blaschke-oss PARAMETER.ARRAY does not require TYPE attribute */ package org.sblim.cimclient.internal.cimxml; @@ -1303,6 +1304,8 @@ String name = attribute(pParamE, "NAME"); if (name == null) throw new CIMXMLParseException( "PARAMETER.ARRAY element missing NAME attribute!"); + if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException( + "PARAMETER.ARRAY element missing TYPE attribute!"); EmbObjHandler iEmbObjHandler = new EmbObjHandler(pParamE); return new CIMParameter<Object>(name, iEmbObjHandler.getArrayType(), iEmbObjHandler .getQualifiers()); |
|
From: Dave B. <bla...@us...> - 2013-11-26 17:48:13
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31003/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMXMLParserImpl.java Log Message: 2704 PARAMETER does not require TYPE attribute Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- CIMXMLParserImpl.java 25 Nov 2013 13:56:30 -0000 1.78 +++ CIMXMLParserImpl.java 26 Nov 2013 17:48:11 -0000 1.79 @@ -85,6 +85,7 @@ * 2701 2013-11-07 blaschke-oss PROPERTY.ARRAY does not require TYPE attribute * 2702 2013-11-07 blaschke-oss Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException * 2703 2013-11-08 blaschke-oss MethodNode should not require TYPE attribute + * 2704 2013-11-11 blaschke-oss PARAMETER does not require TYPE attribute */ package org.sblim.cimclient.internal.cimxml; @@ -1262,6 +1263,8 @@ String name = attribute(pParamE, "NAME"); if (name == null) throw new CIMXMLParseException( "PARAMETER element missing NAME attribute!"); + if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException( + "PARAMETER element missing TYPE attribute!"); EmbObjHandler iEmbObjHandler = new EmbObjHandler(pParamE); // CIMParameter(String name, CIMDataType type, CIMQualifier[] // qualifiers) |
