sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] Git: gather - Metric Data Gatherer branch, master, updated. 76ae836d38ca605daade069fbb5f5ec0ab304651

[Dave H. <hel...@us...>]

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 "gather - Metric Data Gatherer".

The branch, master has been updated
       via  76ae836d38ca605daade069fbb5f5ec0ab304651 (commit)
      from  544dde322302aea7e29ec4c82a3e1ad7cdcc56b8 (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 76ae836d38ca605daade069fbb5f5ec0ab304651
Author: Dave Heller <hel...@us...>
Date:   Mon Feb 10 15:04:44 2014 -0500

    Fixed #2723: repository reported error for GI on interval metric

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    6 ++++++
 NEWS      |    1 +
 mreposl.c |    3 ++-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23570ff..51d9a9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-10  Dave Heller <hel...@us...>
+
+	* NEWS, mreposl.c
+
+	Fixed #2723: repository reported error for GI on interval metric
+
 2014-02-09  Dave Heller <hel...@us...>
 
 	* NEWS, comms/rcctest.c, gatherctl.c, reposctl.c, util/mlog.c
diff --git a/NEWS b/NEWS
index dd93a1b..c46dfb3 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Bugs fixed:
 - #2633 local FS metris calculated inconsitently 
 - #2664 no guest counter in /proc/stat on older kernels 
 - #2722 compile fails when -Werror=format-security flag is used
+- #2723 repository reported error for GI on interval metric
 
 Changes in Version 2.2.8
 ========================
diff --git a/mreposl.c b/mreposl.c
index eaa4609..a8396c5 100644
--- a/mreposl.c
+++ b/mreposl.c
@@ -211,7 +211,8 @@ static int _MetricRetrieveNoLock (COMMHEAP ch, int mid, LocalResourceId *resourc
     syslen = strlen(resource[k].lrid_system) + 1;
     first=NULL;
     mv[k]=NULL;
-    while(mrv && from <= mrv->mrv_value->mvTimeStamp) {
+    while (mrv && (from <= mrv->mrv_value->mvTimeStamp
+        || (maxnum == 2 && num[k] == 1))) { /* [bugs:#2723] */
       if (to >= mrv->mrv_value->mvTimeStamp) {
 	/* mark */
 	if (num[k] < maxnum) {


hooks/post-receive
-- 
gather - Metric Data Gatherer

[Sblim-commit] Git: gather - Metric Data Gatherer branch, master, updated. 544dde322302aea7e29ec4c82a3e1ad7cdcc56b8

[Dave H. <hel...@us...>]

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 "gather - Metric Data Gatherer".

The branch, master has been updated
       via  544dde322302aea7e29ec4c82a3e1ad7cdcc56b8 (commit)
      from  e70a1b2a87439737581d0a8e404cc9952b2e644c (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 544dde322302aea7e29ec4c82a3e1ad7cdcc56b8
Author: Dave Heller <hel...@us...>
Date:   Sun Feb 9 18:43:16 2014 -0500

    Fixed #2722: compile fails when -Werror=format-security flag is used

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    7 +++++++
 Makefile.am     |    2 +-
 NEWS            |    1 +
 comms/rcctest.c |    2 +-
 gatherctl.c     |    2 +-
 reposctl.c      |    4 ++--
 util/mlog.c     |    4 ++--
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8755b7..23570ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-09  Dave Heller <hel...@us...>
+
+	* NEWS, comms/rcctest.c, gatherctl.c, reposctl.c, util/mlog.c
+
+	Fixed #2722: compile fails when -Werror=format-security flag is used
+	(patch by Vitezslav Crhonek)
+
 2013-02-26  Tyrel Datwyler <ty...@li...>
 
 	* NEWS, plugin/cimplugKvm.c, plugin/cimplugXen.c,
diff --git a/Makefile.am b/Makefile.am
index f5ffa21..4447186 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,7 +124,7 @@ EXTRA_DIST+=$(doc_DATA)
 
 # Generally useful flags
 AM_CPPFLAGS = -I $(srcdir)/util -I $(srcdir)/comms @ARCHDEF@
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall -Werror=format-security
 
 PLUG_FLAGS = -no-undefined -module -avoid-version
 
diff --git a/NEWS b/NEWS
index 9fc1129..dd93a1b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Bugs fixed:
 - #2633 local FS metris calculated inconsitently 
 - #2664 no guest counter in /proc/stat on older kernels 
+- #2722 compile fails when -Werror=format-security flag is used
 
 Changes in Version 2.2.8
 ========================
diff --git a/comms/rcctest.c b/comms/rcctest.c
index 356ee61..2101f12 100644
--- a/comms/rcctest.c
+++ b/comms/rcctest.c
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
   if (argc == 1) {
     gethostname((char*)&hostname,sizeof(hostname));
   } else {
-    sprintf(hostname,argv[1]);
+    sprintf(hostname,"%s",argv[1]);
   }
   printf("Contacting %s\n",hostname);
   if (rcc_init(hostname,&port) < 0 ) {
diff --git a/gatherctl.c b/gatherctl.c
index 726c78c..dd59f32 100644
--- a/gatherctl.c
+++ b/gatherctl.c
@@ -146,5 +146,5 @@ static void printhelp()
 {
   int i;
   for (i=0;commands[i];i++)
-    printf(commands[i]);
+    printf("%s",commands[i]);
 }
diff --git a/reposctl.c b/reposctl.c
index 1a702ea..e3d2ddc 100644
--- a/reposctl.c
+++ b/reposctl.c
@@ -271,7 +271,7 @@ static void printhelp()
 {
   int i;
   for (i=0;commands[i];i++)
-    printf(commands[i]);
+    printf("%s",commands[i]);
 }
 
 static void printvalue(ValueRequest *vr)
@@ -317,7 +317,7 @@ static void printvalue(ValueRequest *vr)
       printf("%f",*(double*)vr->vsValues[i].viValue);
       break;
     case MD_STRING:
-      printf(vr->vsValues[i].viValue);
+      printf("%s",vr->vsValues[i].viValue);
       break;
     default:
       printf("datatype %0x not supported",vr->vsDataType);
diff --git a/util/mlog.c b/util/mlog.c
index b1b078d..b202bc0 100644
--- a/util/mlog.c
+++ b/util/mlog.c
@@ -52,10 +52,10 @@ void m_log(int priority, int errout, const char *fmt, ...)
   va_start(ap,fmt);
   
   vsnprintf(buf,4096,fmt,ap);
-  syslog(priosysl,buf);
+  syslog(priosysl,"%s",buf);
 
   if (errout) {
-    fprintf(stderr,buf);
+    fprintf(stderr,"%s",buf);
   }
   va_end(ap);
 }


hooks/post-receive
-- 
gather - Metric Data Gatherer

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-505-g1f5ff60

[Dave H. <hel...@us...>]

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  1f5ff60b4091c88868b0af39a980968d47784429 (commit)
      from  81089c56ed95a93819baa6e97c38f5fc45a02442 (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 1f5ff60b4091c88868b0af39a980968d47784429
Author: Dave Heller <hel...@us...>
Date:   Fri Feb 7 11:41:16 2014 -0500

    [sfcb-tix:#98] sfcbmofpp segfaults if mof file ends with block comment without newline

-----------------------------------------------------------------------

Summary of changes:
 contributions.txt |    4 ++++
 mofpp.c           |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 1a74b5d..f72a5ac 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -244,3 +244,7 @@ Rusty Peng
 Ting Wang
 ----------
 10/13/2013 [sfcb-tix:#81] Bad CMPIType assignment in cimXmlOps
+
+Vitezslav Crhonek, Red Hat
+----------
+02/07/2014 [sfcb-tix:#98] sfcbmofpp segfaults if mof file ends with block comment without newline
diff --git a/mofpp.c b/mofpp.c
index 9e39031..98b7396 100644
--- a/mofpp.c
+++ b/mofpp.c
@@ -128,7 +128,10 @@ processFile(char *fn, FILE * in, FILE * out)
 	}
       } else if (comment == 2) { /* check for block comment */
         if ((e = strstr(s, "*/"))) {
-          strcpy(s, getLineEnding(e));
+          if (getLineEnding(e) != NULL)
+            strcpy(s, getLineEnding(e));
+          else
+            strcpy(s, e + 2);
           comment = 0;
         } else {
           continue;


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/logging LogAndTraceBroker.java, 1.10.2.22, 1.10.2.23

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16929/src/org/sblim/cimclient/internal/logging

Modified Files:
      Tag: Experimental
	LogAndTraceBroker.java 
Log Message:
2720 Add SendIndicationSample

Index: LogAndTraceBroker.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging/LogAndTraceBroker.java,v
retrieving revision 1.10.2.22
retrieving revision 1.10.2.23
diff -u -d -r1.10.2.22 -r1.10.2.23
--- LogAndTraceBroker.java	12 Sep 2013 14:33:18 -0000	1.10.2.22
+++ LogAndTraceBroker.java	21 Jan 2014 19:31:53 -0000	1.10.2.23
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2013
+ * (C) Copyright IBM Corp. 2006, 2014
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -33,6 +33,7 @@
  * 3596303    2013-01-04  blaschke-oss windows http response WWW-Authenticate: Negotiate fails
  *    2652    2013-07-26  blaschke-oss LogAndTraceBroker.setXmlTraceStream should not close previous stream
  *    2651    2013-07-31  blaschke-oss IOException when tracing the cimxml
+ *    2720    2014-01-21  blaschke-oss Add SendIndicationSample
  */
 
 package org.sblim.cimclient.internal.logging;
@@ -109,7 +110,7 @@
 
 	private String iProductName = "SBLIM CIM Client for Java";
 
-	private String iCopyright = "COPYRIGHT (C) 2006, 2013 IBM Corp.";
+	private String iCopyright = "COPYRIGHT (C) 2006, 2014 IBM Corp.";
 
 	private String iVersion = "?";
 

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-504-g81089c5

[Dave H. <hel...@us...>]

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  81089c56ed95a93819baa6e97c38f5fc45a02442 (commit)
      from  8f807ce9ea1bc25d47c9490292f612d3824a8f4a (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 81089c56ed95a93819baa6e97c38f5fc45a02442
Author: Dave Heller <hel...@us...>
Date:   Sat Jan 11 20:12:00 2014 -0500

    [sfcb-tix:#96] Provider should close req handler on shutdown

-----------------------------------------------------------------------

Summary of changes:
 providerDrv.c |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/providerDrv.c b/providerDrv.c
index 6526925..75c5ebd 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -522,10 +522,27 @@ handleSigError(int sig)
 static void
 handleSigUsr1(int __attribute__ ((unused)) sig)
 {
+  Parms *threads = activeThreadsFirst;
+  int dmy = -1;
+  stopping = 1;
+
+  if (threads) {
+    char msg[1024];
+    snprintf(msg, 1023, "*** Provider %s(%d) exiting due to a shutdown request",
+        processName, currentProc);
+    BinResponseHdr *buf = errorCharsResp(CMPI_RC_ERR_FAILED, msg);
+    BinResponseHdr *resp;
+    long rlen = makeSafeResponse(buf, &resp);
+
+    while (threads) {
+      spSendResult(&threads->requestor, &dmy, resp, rlen);
+      threads = threads->next;
+    }
+  }
+
   pthread_t       t;
   pthread_attr_t  tattr;
 
-  stopping = 1;
   pthread_attr_init(&tattr);
   pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
   pthread_create(&t, &tattr, (void *(*)(void *)) stopProc, NULL);


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-503-g8f807ce

[Dave H. <hel...@us...>]

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  8f807ce9ea1bc25d47c9490292f612d3824a8f4a (commit)
      from  88484a71630c60f380242a00e44d4655848f4478 (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 8f807ce9ea1bc25d47c9490292f612d3824a8f4a
Author: Dave Heller <hel...@us...>
Date:   Sat Jan 11 19:13:20 2014 -0500

    [sfcb-tix:#89] Gracefully handle providers doing abort()

-----------------------------------------------------------------------

Summary of changes:
 contributions.txt                           |    2 +
 providerDrv.c                               |   66 ++++++++++++++++-------
 test/TestProviders/cmpiTestMethodProvider.c |   76 +++++++++++++++++++++++++++
 test/schema/root/cimv2/Test_Method.mof      |    1 +
 4 files changed, 125 insertions(+), 20 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 1d55c32..1a74b5d 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -126,6 +126,8 @@ Klaus Kampf, Novell
 09/30/2013 [sfcb-tix:#77] Fix prototype for stopBroker
 10/01/2013 [sfcb-tix:#62] SIGSEGV in ClassProvider, return of 0 from addClParameter() not checked
 10/31/2013 [sfcb-tix:#76] Identify running SFCB processes in ps output (contributions)
+12/29/2013 [sfcb-tix:#90] Problems with enableInteroOp=false (contributions)
+01/12/2014 [sfcb-tix:#89] Gracefully handle providers doing abort() (contributions)
 
 Mike Brasher, Inova
 -------------------
diff --git a/providerDrv.c b/providerDrv.c
index 03f561b..6526925 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -165,14 +165,13 @@ unsigned long   provSampleInterval = 10;
 unsigned long   provTimeoutInterval = 25;
 unsigned        provAutoGroup = 0;
 static int      stopping = 0;
+static int      handlingError = 0;
 
 void            uninitProvProcCtl();
 extern void     uninitSocketPairs();
 extern void     sunsetControl();
 extern void     uninitGarbageCollector();
 
-static BinResponseHdr *err_crash_resp; /* holds generic "we crashed" response */
-static long ecr_len;
 static long makeSafeResponse(BinResponseHdr *hdr, BinResponseHdr **out);
 
 typedef struct parms {
@@ -472,19 +471,52 @@ static void handleSigPipe(int __attribute__ ((unused)) sig)
 
 
 static void
-handleSigSegv(int __attribute__ ((unused)) sig)
+handleSigError(int sig)
 {
-  Parms          *threads = activeThreadsFirst;
+  Parms *threads = activeThreadsFirst;
   int dmy = -1;
+  /* prevent value from being optimized out so we can see it in call stack */
+  char * volatile signame; 
 
-  mlogf(M_ERROR, M_SHOW,
-        "-#- %s - %d provider exiting due to a SIGSEGV signal\n",
-        processName, currentProc);
-  while (threads) {
-    spSendResult(&threads->requestor, &dmy, err_crash_resp, ecr_len);
-    threads=threads->next;
+  if (handlingError)
+    goto end;
+  else
+    handlingError = 1;
+
+  switch (sig) {
+    case (SIGABRT):
+      signame = "SIGABRT";
+      break;
+    case (SIGSEGV):
+      signame = "SIGSEGV";
+      break;
+    case (SIGFPE):
+      signame = "SIGFPE";
+      break;
+    default:
+      signame = "UNKNOWN";
+      break;
   }
-  abort(); /* force cord dump */
+        
+  mlogf(M_ERROR, M_SHOW, "-#- %s - %d provider exiting due to a %s signal\n",
+      processName, currentProc, signame);
+
+  if (threads) {
+    char msg[1024];
+    snprintf(msg, 1023, "*** Provider %s(%d) exiting due to a %s signal",
+        processName, currentProc, signame);
+    BinResponseHdr *buf = errorCharsResp(CMPI_RC_ERR_FAILED, msg);
+    BinResponseHdr *resp;
+    long rlen = makeSafeResponse(buf, &resp);
+
+    while (threads) {
+      spSendResult(&threads->requestor, &dmy, resp, rlen);
+      threads = threads->next;
+    }
+  }
+  abort(); /* force core dump */
+
+  end:;
 }
 
 static void
@@ -894,7 +926,9 @@ getProcess(ProviderInfo * info, ProviderProcess ** proc)
         setSignal(SIGUSR1, handleSigUsr1, 0);
         setSignal(SIGUSR2, SIG_IGN,0);
 
-        setSignal(SIGSEGV, handleSigSegv, SA_ONESHOT);
+        setSignal(SIGSEGV, handleSigError, SA_ONESHOT);
+        setSignal(SIGABRT, handleSigError, SA_ONESHOT);
+        setSignal(SIGFPE, handleSigError, SA_ONESHOT);
 
         /* Label the process by modifying the cmdline */
         extern void append2Argv(char *appendstr);
@@ -970,14 +1004,6 @@ getProcess(ProviderInfo * info, ProviderProcess ** proc)
           _SFCB_ABORT();
         }
 
-        char msg[1024];
-        snprintf(msg,1023, "*** Provider %s(%d) exiting due to a SIGSEGV signal",
-                 processName, currentProc);
-        BinResponseHdr* buf = errorCharsResp(CMPI_RC_ERR_FAILED, msg);
-
-        ecr_len = makeSafeResponse(buf, &err_crash_resp);
-	free(buf);
-
         processProviderInvocationRequests(info->providerName);
         _SFCB_RETURN(0);
       }
diff --git a/test/TestProviders/cmpiTestMethodProvider.c b/test/TestProviders/cmpiTestMethodProvider.c
index a7c920f..1eb87ed 100644
--- a/test/TestProviders/cmpiTestMethodProvider.c
+++ b/test/TestProviders/cmpiTestMethodProvider.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <stdio.h>
+#include <signal.h>
 #include "cmpi/cmpidt.h"
 #include "cmpi/cmpift.h"
 #include "cmpi/cmpimacs.h"
@@ -121,12 +122,87 @@ TestMethodProviderInvokeMethod(CMPIMethodMI * mi,
        * Adds a value of str2 string to out array argument 
        */
       rc = CMAddArg(out, argName, &val2, CMPI_string);
+
+    /*
+     * For: 3048960 method array types not filled in Test provider. 
+     */
     } else if (!strcmp("CheckArrayNoType", methodName)) {
       data = CMGetArg(in, "IntArray", &rc);
       CMPIType atype=data.value.array->ft->getSimpleType(data.value.array,&rc); 
       sprintf(result,"Datatype is %s",paramType(atype));
       str1 = CMNewString(_broker, result, &rc);
       val1.string = str1;
+
+    /*
+     * This method simulates various provider problems for testing. 
+     */
+    } else if (!strcmp("Misbehave", methodName)) {
+      data = CMGetArg(in, "Action", &rc);
+
+      const char *strval = NULL;
+      if (data.type == CMPI_string && !(CMIsNullValue(data))) {
+        strval = CMGetCharsPtr(data.value.string, &rc);
+        sprintf(result, "data type is %s, value = %s", paramType(data.type),
+            strval);
+        
+        if (!strcmp(strval,"hang")) {
+          while(sleep(60)); /* to test req handler timeout, etc. */
+        }
+        else if (!strcmp(strval,"abort")) {
+          abort();
+        }
+        else if (!strcmp(strval,"fpe")) {
+          #pragma GCC diagnostic ignored "-Wdiv-by-zero"
+          fprintf(stderr,"ouch! %d\n",1/0);
+          #pragma GCC diagnostic warning "-Wdiv-by-zero"
+        }
+        else if (!strcmp(strval,"segfault")) {
+          void (*crashme)(void) = NULL;
+          crashme();
+        }
+        /*
+         * These tend to behave as if the condition were raised internally
+         */
+        else if (!strcmp(strval,"sigabrt")) {
+          kill(getpid(), SIGABRT);
+          while(sleep(3)); /* slight pause to ensure we catch signal */
+        }
+        else if (!strcmp(strval,"sigfpe")) {
+          kill(getpid(), SIGFPE);
+          while(sleep(3));
+        }
+        else if (!strcmp(strval,"sigsegv")) {
+          kill(getpid(), SIGSEGV);
+          while(sleep(3));
+        }
+        else if (!strcmp(strval,"sigusr1")) {
+          kill(getpid(), SIGUSR1); /* as if we received a signal from stopBroker() */
+          while(sleep(3));
+        }
+        else if (!strcmp(strval,"sigkill")) {
+          kill(getpid(), SIGKILL); /* this is currently not handled by providerDrv*/
+          while(sleep(3));
+        } else {
+          sprintf(result, "Action not recognized: %s", strval);
+          fprintf(stderr,
+              "+++ cmpiTestMethodProvider: Action not recognized \"%s\"\n",
+              strval);
+        }
+        /*
+         * create the new string to return to client 
+         */
+        str1 = CMNewString(_broker, result, &rc);
+        val1.string = str1;
+      }
+
+    } else {
+      sprintf(result, "Unknown method name: %s", methodName);
+      fprintf(stderr,
+          "+++ cmpiTestMethodProvider: Unknown method name \"%s\"\n",
+          methodName);
+      
+      str1 = CMNewString(_broker, result, &rc);
+      val1.string = str1;
     }
   }
   CMReturnData(rslt, (CMPIValue *) & val1, CMPI_string);
diff --git a/test/schema/root/cimv2/Test_Method.mof b/test/schema/root/cimv2/Test_Method.mof
index 58e6d5e..7365ba6 100644
--- a/test/schema/root/cimv2/Test_Method.mof
+++ b/test/schema/root/cimv2/Test_Method.mof
@@ -2,4 +2,5 @@ class Sample_Method
 {
         string SayHello( [IN] string Name, [OUT] string Message);
         string CheckArrayNoType( [IN] uint32 IntArray[], [OUT] string Message); 
+        string Misbehave( [IN] string Action, [OUT] string Message);
 };


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-502-g88484a7

[Dave H. <hel...@us...>]

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  88484a71630c60f380242a00e44d4655848f4478 (commit)
      from  12d4de225330e2394331dc6ced4b1b10bb2e0db5 (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 88484a71630c60f380242a00e44d4655848f4478
Author: Dave Heller <hel...@us...>
Date:   Sun Jan 5 14:31:23 2014 -0500

    [sfcb-tix:#95] Do not release pthread lock prior to stopBroker() exit

-----------------------------------------------------------------------

Summary of changes:
 sfcBroker.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sfcBroker.c b/sfcBroker.c
index 49204a1..a71dc32 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -281,7 +281,7 @@ stopBroker(void *p)
   closeLogging(1);
   free((void *)sfcBrokerStart);
 
-  pthread_mutex_unlock(&syncMtx);
+//  pthread_mutex_unlock(&syncMtx); /* [sfcb#95] */
 
   unloadHostnameLib();
 


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-501-g12d4de2

[Dave H. <hel...@us...>]

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  12d4de225330e2394331dc6ced4b1b10bb2e0db5 (commit)
      from  b954c9424f2048655529f35b1196a926bafee72e (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 12d4de225330e2394331dc6ced4b1b10bb2e0db5
Author: Dave Heller <hel...@us...>
Date:   Sun Jan 5 14:23:11 2014 -0500

    [sfcb-tix:#94] Increase sigChldWaitTime

-----------------------------------------------------------------------

Summary of changes:
 sfcBroker.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sfcBroker.c b/sfcBroker.c
index 5063415..49204a1 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -193,6 +193,9 @@ static pthread_cond_t sdCnd = PTHREAD_COND_INITIALIZER;
 static int      stopping = 0;
 extern int      remSem();
 
+/* secs to wait for a process to die during shutdown [sfcb#94] */
+static int      sigChldWaitTime = 3;
+
 static void
 stopBroker(void *p)
 {
@@ -232,7 +235,7 @@ stopBroker(void *p)
 
     if (adaptersStopped == 0) {
       pthread_mutex_lock(&sdMtx);
-      waitTime.tv_sec = time(NULL) + 1; //5
+      waitTime.tv_sec = time(NULL) + sigChldWaitTime;
       waitTime.tv_nsec = 0;
       if (sa == 0)
         fprintf(stderr, "--- Stopping adapters\n");
@@ -251,7 +254,7 @@ stopBroker(void *p)
 
     if (adaptersStopped) {
       pthread_mutex_lock(&sdMtx);
-      waitTime.tv_sec = time(NULL) + 1; //5
+      waitTime.tv_sec = time(NULL) + sigChldWaitTime;
       waitTime.tv_nsec = 0;
       if (sp == 0)
         fprintf(stderr, "--- Stopping providers\n");
@@ -436,7 +439,7 @@ handleSigUsr2(int __attribute__ ((unused)) sig)
    }
    while(!adaptersStopped) {
        pthread_mutex_lock(&sdMtx);
-       waitTime.tv_sec=time(NULL)+1; //5
+       waitTime.tv_sec=time(NULL) + sigChldWaitTime;
        waitTime.tv_nsec=0;
        if (sa==0) fprintf(stderr,"--- Stopping http adapters\n");
        sa++;


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-500-gb954c94

[Dave H. <hel...@us...>]

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  b954c9424f2048655529f35b1196a926bafee72e (commit)
      from  ff466d9f0ecd4953b7437ff03be68a33b85c966c (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 b954c9424f2048655529f35b1196a926bafee72e
Author: Dave Heller <hel...@us...>
Date:   Sun Dec 29 12:18:36 2013 -0500

    bump version number

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |   10 +++++++++-
 configure.ac |    2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index cfb8a29..b4a0142 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
-hanges in 1.4.7
+Changes in 1.4.8
+================
+
+New features:
+
+Bugs fixed:
+
+
+Changes in 1.4.7
 ================
 
 New features:
diff --git a/configure.ac b/configure.ac
index 9c71631..609209b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(Small Footprint CIM Broker, 1.4.7, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.4.8-preview, sbl...@li..., sblim-sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
 
 #disable "seems to ignore the --datarootdir setting" warnings


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker tag, SFCB_1_4_7, created. SFCB_1_4_0-499-gff466d9

[Dave H. <hel...@us...>]

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 tag, SFCB_1_4_7 has been created
        at  ff466d9f0ecd4953b7437ff03be68a33b85c966c (commit)

- Log -----------------------------------------------------------------
commit ff466d9f0ecd4953b7437ff03be68a33b85c966c
Author: Dave Heller <hel...@us...>
Date:   Sun Dec 29 12:05:50 2013 -0500

    prep for 1.4.7 release
-----------------------------------------------------------------------


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-499-gff466d9

[Dave H. <hel...@us...>]

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  ff466d9f0ecd4953b7437ff03be68a33b85c966c (commit)
      from  405966f68966311083f66e5a974d2535390cfdb5 (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 ff466d9f0ecd4953b7437ff03be68a33b85c966c
Author: Dave Heller <hel...@us...>
Date:   Sun Dec 29 12:05:50 2013 -0500

    prep for 1.4.7 release

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |   15 +++++++++++++--
 configure.ac |    2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 428236b..cfb8a29 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,21 @@
-Changes in 1.4.7
+hanges in 1.4.7
 ================
 
 New features:
+- [sfcb-tix:#86] Support configurable SSL Diffie Hellman parameters file
+- [sfcb-tix:#87] Support configurable SSL ECDH elliptic curve name
+- [sfcb-tix:#76] Identify running SFCB processes in ps output
 
 Bugs fixed:
-
+- [sfcb-tix:#81] Bad CMPIType assignment in cimXmlOps
+- [sfcb-tix:#82] ClientEnvFT for SfcbLocal doesn't match SFCC
+- [sfcb-tix:#83] Add Alternate getObjectPath() for SfcbLocal Connections
+- [sfcb-tix:#84] Upcall mutex not freed on shutdown
+- [sfcb-tix:#85] SFCB: SfcbLocal interface should expose markHeap() and releaseHeap()
+- [sfcb-tix:#88] Ensure unique semaphore keys across multiple http adapters
+- [sfcb-tix:#92] indicationDeliveryThreadLimit not properly enforced
+- [sfcb-tix:#93] ProfileProvider segfault while stopping slpUpdate thread
+- [sfcb-tix:#90] Problems with enableInteroOp=false
 
 Changes in 1.4.6
 ================
diff --git a/configure.ac b/configure.ac
index 81bc077..9c71631 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(Small Footprint CIM Broker, 1.4.7-preview, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.4.7, sbl...@li..., sblim-sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
 
 #disable "seems to ignore the --datarootdir setting" warnings


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-498-g405966f

[Dave H. <hel...@us...>]

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  405966f68966311083f66e5a974d2535390cfdb5 (commit)
      from  838013f2bffc67de3fa2ffd8cae891c14c5c1f76 (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 405966f68966311083f66e5a974d2535390cfdb5
Author: Dave Heller <hel...@us...>
Date:   Sat Dec 28 12:28:30 2013 -0500

    [sfcb-tix:#90] Problems with enableInteroOp=false

-----------------------------------------------------------------------

Summary of changes:
 classProviderGz.c |    8 ++++++++
 classProviderSf.c |    8 ++++++++
 providerMgr.c     |   43 +++++++++++++++++++++++++++++++++----------
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/classProviderGz.c b/classProviderGz.c
index eb17c36..84b2f58 100644
--- a/classProviderGz.c
+++ b/classProviderGz.c
@@ -101,6 +101,8 @@ int             traverseChildren(ClassRegister * cReg, const char *parent,
 
 static int      nsBaseLen;
 
+extern unsigned long exFlags;
+
 static void
 buildInheritanceTable(ClassRegister * cr)
 {
@@ -458,6 +460,12 @@ gatherNameSpaces(char *dn, UtilHashTable * ns, int first)
         continue;
       if (strcmp(de->d_name, "..") == 0)
         continue;
+      if (!(exFlags & 2)) {
+        /* enforce enableInterOp = false [sfcb#90] */
+        if (strncmp(de->d_name, "interop", 7) == 0) {
+          continue;
+        }
+      }
       l = strlen(dn) + strlen(de->d_name) + 4;
       n = malloc(l + 8);
       strcpy(n, dn);
diff --git a/classProviderSf.c b/classProviderSf.c
index 8e69599..9b0de41 100644
--- a/classProviderSf.c
+++ b/classProviderSf.c
@@ -128,6 +128,8 @@ int             traverseChildren(ClassRegister * cReg, const char *parent,
 
 static int      nsBaseLen;
 
+extern unsigned long exFlags;
+
 static void
 buildInheritanceTable(ClassRegister * cr)
 {
@@ -480,6 +482,12 @@ gatherNameSpaces(char *dn, UtilHashTable * ns, int first)
         continue;
       if (strcmp(de->d_name, "..") == 0)
         continue;
+      if (!(exFlags & 2)) {
+        /* enforce enableInterOp = false [sfcb#90] */
+        if (strncmp(de->d_name, "interop", 7) == 0) {
+          continue;
+        }
+      }
       l = strlen(dn) + strlen(de->d_name) + 4;
       n = malloc(l + 8);
       strcpy(n, dn);
diff --git a/providerMgr.c b/providerMgr.c
index 085eeb1..6aa1486 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -198,6 +198,15 @@ lookupProvider(long type, char *className, char *nameSpace, CMPIStatus *st)
   ProviderInfo   *info;
   UtilHashTable **ht = provHt(type, 0);
 
+  /* enforce enableInterOp = false [sfcb#90] */
+  if (!(exFlags & 2)) {
+    if (strcasecmp(nameSpace, "root/interop") == 0) {
+      st->msg = sfcb_native_new_CMPIString("Interop namespace disabled",NULL,0);
+      st->rc = CMPI_RC_ERR_INVALID_NAMESPACE;
+      _SFCB_RETURN(NULL);
+    }
+  }
+
   if (*ht == NULL) {
     *ht = UtilFactory->newHashTable(61,
                                     UtilHashTable_charKey |
@@ -1007,27 +1016,41 @@ processProviderMgrRequests()
   sigfillset(&mask);
   sigprocmask(SIG_SETMASK, &mask, &old_mask);
 
-  rc=startUpProvider("root/interop", "$ClassProvider$",0);
-  if (rc != 0 ) {
-    mlogf(M_ERROR,M_SHOW,"--- ClassProvider failed to start, rc:%d\n",rc);
-    sigprocmask(SIG_SETMASK, &old_mask, NULL);
-    _SFCB_RETURN();
+  /* enforce enableInterOp = false [sfcb#90] */
+  if (exFlags & 2) {
+    rc=startUpProvider("root/interop", "$ClassProvider$",0);
+    if (rc != 0 ) {
+      mlogf(M_ERROR,M_SHOW,"--- ClassProvider failed to start, rc:%d\n",rc);
+      sigprocmask(SIG_SETMASK, &old_mask, NULL);
+      _SFCB_RETURN();
+    }
+      
+    /* wait until classProvider is finished init'ing */
+    semAcquire(sfcbSem,INIT_CLASS_PROV_ID);
+  }
+  else {
+    interOpProvInfoPtr = forceNoProvInfoPtr;
   }
-    
-  /* wait until classProvider is finished init'ing */
-  semAcquire(sfcbSem,INIT_CLASS_PROV_ID);
 
 #ifdef SFCB_INCL_INDICATION_SUPPORT
-  if (interOpProvInfoPtr != forceNoProvInfoPtr) {
+  if (exFlags & 2) {
     startUpProvider("root/interop", "$InterOpProvider$",1);
     /* note: we don't wait here for interopProvider to finish init'ing, 
        because its init has some reqs that providerMgr will need to process.
        httpAdapter waits for interop to init before accepting HTTP requests */
+  } else {
+    mlogf(M_INFO, M_SHOW,
+        "--- No indication support because InterOp namespace disabled\n");
   }
 
 #endif
 #ifdef HAVE_SLP
-  startUpProvider("root/interop", "$ProfileProvider$",1);
+  if (exFlags & 2) {
+    startUpProvider("root/interop", "$ProfileProvider$",1);
+  } else {
+    mlogf(M_INFO, M_SHOW,
+        "--- No SLP support because InterOp namespace disabled\n");
+  }
 #endif
    sigprocmask(SIG_SETMASK, &old_mask, NULL);
 


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-497-g838013f

[Dave H. <hel...@us...>]

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  838013f2bffc67de3fa2ffd8cae891c14c5c1f76 (commit)
      from  d152551df1341473e576da41012951642cab47c8 (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 838013f2bffc67de3fa2ffd8cae891c14c5c1f76
Author: Dave Heller <hel...@us...>
Date:   Tue Dec 17 00:58:42 2013 -0500

    [sfcb-tix:#93] ProfileProvider segfault while stopping slpUpdate thread

-----------------------------------------------------------------------

Summary of changes:
 profileProvider.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/profileProvider.c b/profileProvider.c
index c2e1e87..433dcda 100644
--- a/profileProvider.c
+++ b/profileProvider.c
@@ -211,12 +211,14 @@ CMPIStatus ProfileProviderMethodCleanup(CMPIMethodMI * mi,
   CMPIStatus      st = { CMPI_RC_OK, NULL };
   _SFCB_ENTER(TRACE_INDPROVIDER, "ProfileProviderCleanup");
 #ifdef HAVE_SLP
-  // Tell SLP update thread that we're shutting down
-  _SFCB_TRACE(1, ("--- Stopping SLP thread"));
-  pthread_kill(slpUpdateThread, SIGUSR2);
-  // Wait for thread to complete
-  pthread_join(slpUpdateThread, NULL);
-  _SFCB_TRACE(1, ("--- SLP Thread stopped"));
+  if (slpUpdateThread) {
+    // Tell SLP update thread that we're shutting down
+    _SFCB_TRACE(1, ("--- Stopping SLP thread"));
+    pthread_kill(slpUpdateThread, SIGUSR2);
+    // Wait for thread to complete
+    pthread_join(slpUpdateThread, NULL);
+    _SFCB_TRACE(1, ("--- SLP Thread stopped"));
+  }
 #endif // HAVE_SLP
   _SFCB_RETURN(st);
 }


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. a85824d2959084180b1086d4039124b15ed393c9

[Dave H. <hel...@us...>]

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_1.3 has been updated
       via  a85824d2959084180b1086d4039124b15ed393c9 (commit)
      from  048e3abfb52f6ae5a5b15e33f482405c34a9fb4e (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 a85824d2959084180b1086d4039124b15ed393c9
Author: Dave Heller <hel...@us...>
Date:   Tue Dec 17 00:53:53 2013 -0500

    [sfcb-tix:#93] ProfileProvider segfault while stopping slpUpdate thread

-----------------------------------------------------------------------

Summary of changes:
 profileProvider.c |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/profileProvider.c b/profileProvider.c
index 8fb9847..4c4ae41 100644
--- a/profileProvider.c
+++ b/profileProvider.c
@@ -81,12 +81,14 @@ CMPIStatus ProfileProviderMethodCleanup(CMPIMethodMI * mi,
   CMPIStatus      st = { CMPI_RC_OK, NULL };
   _SFCB_ENTER(TRACE_INDPROVIDER, "ProfileProviderCleanup");
 #ifdef HAVE_SLP
-  // Tell SLP update thread that we're shutting down
-  _SFCB_TRACE(1, ("--- Stopping SLP thread"));
-  pthread_kill(slpUpdateThread, SIGUSR2);
-  // Wait for thread to complete
-  pthread_join(slpUpdateThread, NULL);
-  _SFCB_TRACE(1, ("--- SLP Thread stopped"));
+  if (slpUpdateThread) {
+    // Tell SLP update thread that we're shutting down
+    _SFCB_TRACE(1, ("--- Stopping SLP thread"));
+    pthread_kill(slpUpdateThread, SIGUSR2);
+    // Wait for thread to complete
+    pthread_join(slpUpdateThread, NULL);
+    _SFCB_TRACE(1, ("--- SLP Thread stopped"));
+  }
 #endif // HAVE_SLP
   _SFCB_RETURN(st);
 }
@@ -248,8 +250,9 @@ spawnUpdateThread(const CMPIContext *ctx)
   pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
   rc = pthread_create(&newThread, &attr, slpUpdate, thread_args);
   if(rc) {
-    // deal with thread creation error
-    exit(1);
+    mlogf(M_ERROR, M_SHOW, "--- Could not create SLP update thread. SLP disabled.");
+    /* note: without SLP running, this provider is pretty useless.  But 
+       if it's marked "unload: never" there's not much we can do from here */
   }
 }
 


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client build.xml, 1.48, 1.48.8.1 sblim-cim-client2.spec, 1.31, 1.31.2.1

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11155

Modified Files:
      Tag: CIM_CLIENT_2_2_5_M
	build.xml sblim-cim-client2.spec 
Log Message:
2.2.5 release work

Index: sblim-cim-client2.spec
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -d -r1.31 -r1.31.2.1
--- sblim-cim-client2.spec	13 Dec 2013 10:47:29 -0000	1.31
+++ sblim-cim-client2.spec	13 Dec 2013 11:00:22 -0000	1.31.2.1
@@ -1,7 +1,7 @@
 %define name                    sblim-cim-client2
 %define project_folder			%{name}-%{version}-src
 %define archive_folder			build
-%define version                 HEAD
+%define version                 2.2.5
 %define release                 1jpp
 %define section                 free
 

Index: build.xml
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/build.xml,v
retrieving revision 1.48
retrieving revision 1.48.8.1
diff -u -d -r1.48 -r1.48.8.1
--- build.xml	6 Feb 2013 13:05:46 -0000	1.48
+++ build.xml	13 Dec 2013 11:00:21 -0000	1.48.8.1
@@ -36,7 +36,7 @@
     <property name="Manifest.name" value="SBLIM CIM Client for Java" />
     <property name="Manifest.title" value="SBLIM CIM Client for Java" />
     <property name="Manifest.vendor" value="IBM Corporation 2005, 2013" />
-    <property name="Manifest.version" value="HEAD" />
+    <property name="Manifest.version" value="2.2.5" />
 
     <property name="Directory.source.core" value="${basedir}/src" />
     <property name="Directory.source.samples" value="${basedir}/smpl" />

[Sblim-commit] jsr48-client ChangeLog, 1.29, 1.30 sblim-cim-client2.spec, 1.30, 1.31 NEWS, 1.425, 1.426

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10357

Modified Files:
	ChangeLog sblim-cim-client2.spec NEWS 
Log Message:
2.2.5 release work

Index: sblim-cim-client2.spec
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- sblim-cim-client2.spec	13 Sep 2013 11:16:38 -0000	1.30
+++ sblim-cim-client2.spec	13 Dec 2013 10:47:29 -0000	1.31
@@ -158,6 +158,63 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Dec 13 2013 Dave Blaschke <bla...@us...>
+- New release 2.2.5
+  o 2717 Update detailed release history HTML for 2.2.5
+  o 2716 Sync up javax.* javadoc with JSR48 1.0.0 Final V
+  o 2719 TCK: CIM APIs should not generate NullPointerException
+  o 2594 CR28: Support CIMErrorDescription HTTP field
+  o 2718 Bad CIMStatusCode generates NumberFormatException
+  o 2538 CR14: Support new CORRELATOR element
+  o 2715 Add VALUE.NULL support
+  o 2714 Add detailed CIM-XML parser test based on DSP0201 2.4
+  o 2713 Enforce loose validation of CIM-XML documents
+  o 2712 SimpleReqNode allows any CIM element as child
+  o 2709 Lower the level of the EOF message to FINE
+  o 2711 LOCALNAMESPACEPATH allows 0 NAMESPACE children
+  o 2710 parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child
+  o 2708 CIMNode quietly ignores DECLARATION child
+  o 2707 INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children
+  o 2706 Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException
+  o 2705 PARAMETER.ARRAY does not require TYPE attribute
+  o 2704 PARAMETER does not require TYPE attribute
+  o 2703 MethodNode should not require TYPE attribute
+  o 2702 Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException
+  o 2701 PROPERTY.ARRAY does not require TYPE attribute
+  o 2700 PROPERTY does not require TYPE attribute
+  o 2699 parseQUALIFIER does not require TYPE attribute
+  o 2697 (I)MethodResponseNode allows ERROR with PARAMVALUE
+  o 2696 parseIRETURNVALUE ignores VALUE and VALUE.ARRAY
+  o 2695 parseMETHODCALL allows LOCALCLASSPATH and LOCALINSTANCEPATH
+  o 2694 NAME attribute not required by DOM parser (part 2)
+  o 2693 ReturnValueNode allows invalid PARAMTYPE attribute
+  o 2691 RETURNVALUE should not require PARAMTYPE attribute
+  o 2537 Add new data types for PARAMVALUE
+  o 2690 Remove RESPONSEDESTINATION support
+  o 2689 createMETHODCALL should not add PARAMTYPE attribute
+  o 2688 parseMETHODCALL looks for CIMName attribute instead of NAME
+  o 2687 ExpParamValueNode allows VALUE, (I)METHODRESPONSE children
+  o 2686 parseEXPPARAMVALUE allows 2+ children, prohibits 0
+  o 2685 Element.getAttribute returns empty string if no attribute
+  o 2684 parseEXPMETHODRESPONSE has several issues
+  o 2683 KEYVALUE VALUETYPE optional, "string" default
+  o 2682 (I)MethodCallNode allows no LOCAL*PATH
+  o 2681 parseQUALIFIERDECLARATION does not require TYPE attribute
+  o 2680 IPARAMVALUE parsing broken on DOM/SAX
+  o 2679 parseIMETHODCALL requires one IPARAMVALUE child element
+  o 2678 parseMULTI___ allows one SIMPLE___ child element
+  o 2677 ObjectPathNode allows all child nodes
+  o 2676 parseMULTI(EXP)REQ looking for wrong child elements
+  o 2675 CIMXMLParseException messages should contain element name
+  o 2674 Null pointer exception in CIMDateTime(String)
+  o 2673 NameSpaceNode does not need testCompletness()
+  o 2672 Remove SIMPLEREQACK support
+  o 2671 Potential null pointer exception in parseERROR
+  o 2670 NAME attribute not required by DOM parser
+  o 2669 Potential null pointer exception in parseMESSAGE
+  o 2668 Potential null pointer exception in parseCIM
+  o 2666 CR12: Remove ENUMERATIONCONTEXT
+
 * Fri Sep 13 2013 Dave Blaschke <bla...@us...>
 - New release 2.2.4
   o 2661 Update detailed release history HTML for 2.2.4

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -d -r1.425 -r1.426
--- NEWS	12 Dec 2013 14:54:57 -0000	1.425
+++ NEWS	13 Dec 2013 10:47:29 -0000	1.426
@@ -1,4 +1,4 @@
-Changes in HEAD
+Version 2.2.5
 ================
    2717 Update detailed release history HTML for 2.2.5
    2716 Sync up javax.* javadoc with JSR48 1.0.0 Final V

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	13 Sep 2013 11:16:38 -0000	1.29
+++ ChangeLog	13 Dec 2013 10:47:29 -0000	1.30
@@ -1,3 +1,452 @@
+Release 2.2.5
+=============
+
+Thu Dec 12 08:54:57 CST 2013	blaschke-oss
+
+	2717 Update detailed release history HTML for 2.2.5
+
+	NEWS 1.425
+	history.html 1.12
+
+Thu Dec 12 08:46:35 CST 2013	blaschke-oss
+
+	2716 Sync up javax.* javadoc with JSR48 1.0.0 Final V
+
+	WBEMClient.java 1.23
+	UnsignedInteger8.java 1.17
+	UnsignedInteger64.java 1.14
+	UnsignedInteger32.java 1.16
+	UnsignedInteger16.java 1.16
+	CIMValuedElement.java 1.15
+	CIMObjectPath.java 1.35
+	CIMElement.java 1.16
+	CIMDateTimeInterval.java 1.26
+	CIMDateTimeAbsolute.java 1.24
+	CIMClass.java 1.31
+	NEWS 1.424
+
+Thu Dec 12 07:21:08 CST 2013	blaschke-oss
+
+	2719 TCK: CIM APIs should not generate NullPointerException
+
+	UnsignedInteger8.java 1.16
+	UnsignedInteger64.java 1.13
+	UnsignedInteger32.java 1.15
+	UnsignedInteger16.java 1.15
+	CIMClass.java 1.30
+	NEWS 1.423
+
+Thu Dec 12 06:09:03 CST 2013	blaschke-oss
+
+	2594 CR28: Support CIMErrorDescription HTTP field
+
+	WBEMClientCIMXML.java 1.85
+	NEWS 1.422
+
+Thu Dec 12 05:57:47 CST 2013	blaschke-oss
+
+	2718 Bad CIMStatusCode generates NumberFormatException
+
+	HttpHeaderTest.java 1.7
+	HttpHeader.java 1.15
+	NEWS 1.421
+
+Thu Dec 12 05:35:40 CST 2013	blaschke-oss
+
+	2538 CR14: Support new CORRELATOR element
+
+	SimpleReqNode.java 1.10
+	SimpleExpReqNode.java 1.8
+	CIMXMLParserImpl.java 1.87
+	DSP0201Test.java 1.3
+	CorrelatorNode.java 1.2
+	NodeFactory.java 1.11
+	NodeConstIf.java 1.14
+	NEWS 1.420
+
+Tue Dec 10 10:22:00 CST 2013	blaschke-oss
+
+	2715 Add VALUE.NULL support
+
+	IReturnValueTest.java 1.3
+	ValueRefArrayNode.java 1.13
+	ValueArrayNode.java 1.11
+	CIMXMLParserImpl.java 1.86
+	NEWS 1.419
+
+Mon Dec 09 04:46:21 CST 2013	blaschke-oss
+
+	2714 Add detailed CIM-XML parser test based on DSP0201 2.4
+
+	DSP0201Test.java 1.2
+	testcases.parser.txt 1.13
+	unittest.html 1.34
+	NEWS 1.418
+
+Mon Dec 09 04:33:42 CST 2013	blaschke-oss
+
+	2713 Enforce loose validation of CIM-XML documents
+
+	XMLDefaultHandlerImpl.java 1.9
+	CIMXMLParserImpl.java 1.85
+	NEWS 1.417
+
+Tue Dec 03 08:06:16 CST 2013	blaschke-oss
+
+	2712 SimpleReqNode allows any CIM element as child
+
+	SimpleReqNode.java 1.9
+	NEWS 1.416
+
+Wed Nov 27 05:56:38 CST 2013	blaschke-oss
+
+	2709 Lower the level of the EOF message to FINE
+
+	ChunkedInputStream.java 1.15
+	HttpMethod.java 1.9
+	HttpClient.java 1.52
+	NEWS 1.415
+
+Wed Nov 27 05:47:39 CST 2013	blaschke-oss
+
+	2711 LOCALNAMESPACEPATH allows 0 NAMESPACE children
+
+	WBEMConfigurationDefaults.java 1.38
+	WBEMConfiguration.java 1.56
+	LocalNameSpacePathNode.java 1.10
+	CIMXMLParserImpl.java 1.84
+	WBEMConfigurationProperties.java 1.58
+	sblim-cim-client2.properties 1.40
+	NEWS 1.414
+
+Wed Nov 27 05:24:28 CST 2013	blaschke-oss
+
+	2710 parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child
+
+	CIMXMLParserImpl.java 1.83
+	NEWS 1.413
+
+Tue Nov 26 12:22:01 CST 2013	blaschke-oss
+
+	2708 CIMNode quietly ignores DECLARATION child
+
+	CIMNode.java 1.9
+	NEWS 1.412
+
+Tue Nov 26 12:15:19 CST 2013	blaschke-oss
+
+	2707 INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children
+
+	InstanceNameNode.java 1.9
+	CIMXMLParserImpl.java 1.82
+	NEWS 1.411
+
+Tue Nov 26 12:06:15 CST 2013	blaschke-oss
+
+	2706 Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException
+
+	Node.java 1.17
+	CIMXMLParserImpl.java 1.81
+	NEWS 1.410
+
+Tue Nov 26 11:55:59 CST 2013	blaschke-oss
+
+	2705 PARAMETER.ARRAY does not require TYPE attribute
+
+	ParameterArrayNode.java 1.7
+	CIMXMLParserImpl.java 1.80, 1.88
+	NEWS 1.409
+
+Tue Nov 26 11:48:11 CST 2013	blaschke-oss
+
+	2704 PARAMETER does not require TYPE attribute
+
+	ParameterNode.java 1.7
+	CIMXMLParserImpl.java 1.79
+	NEWS 1.408
+
+Mon Nov 25 07:56:30 CST 2013	blaschke-oss
+
+	2703 MethodNode should not require TYPE attribute
+
+	MethodNode.java 1.12
+	CIMXMLParserImpl.java 1.78
+	NEWS 1.407
+
+Mon Nov 25 07:49:28 CST 2013	blaschke-oss
+
+	2702 Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException
+
+	Node.java 1.16
+	CIMXMLParserImpl.java 1.77
+	NEWS 1.406
+
+Mon Nov 25 07:42:35 CST 2013	blaschke-oss
+
+	2701 PROPERTY.ARRAY does not require TYPE attribute
+
+	PropertyArrayNode.java 1.10
+	CIMXMLParserImpl.java 1.76
+	NEWS 1.405
+
+Mon Nov 25 07:33:29 CST 2013	blaschke-oss
+
+	2700 PROPERTY does not require TYPE attribute
+
+	PropertyNode.java 1.10
+	CIMXMLParserImpl.java 1.75
+	NEWS 1.404
+
+Mon Nov 25 07:24:19 CST 2013	blaschke-oss
+
+	2699 parseQUALIFIER does not require TYPE attribute
+
+	SVCEnumQualiTypes.xml 1.4
+	CIMXMLParserImpl.java 1.74
+	NEWS 1.403
+
+Mon Nov 25 07:08:32 CST 2013	blaschke-oss
+
+	2697 (I)MethodResponseNode allows ERROR with PARAMVALUE
+
+	MethodResponseNode.java 1.12
+	IMethodResponseNode.java 1.10
+	NEWS 1.402
+
+Mon Nov 25 06:55:37 CST 2013	blaschke-oss
+
+	2696 parseIRETURNVALUE ignores VALUE and VALUE.ARRAY
+
+	IReturnValueTest.java 1.2
+	testcases.parser.txt 1.12
+	CIMXMLParserImpl.java 1.73
+	unittest.html 1.33
+	NEWS 1.401
+
+Mon Nov 25 06:37:54 CST 2013	blaschke-oss
+
+	2695 parseMETHODCALL allows LOCALCLASSPATH and LOCALINSTANCEPATH
+
+	CIMXMLParserImpl.java 1.72
+	NEWS 1.400
+
+Mon Nov 25 06:27:38 CST 2013	blaschke-oss
+
+	2694 NAME attribute not required by DOM parser (part 2)
+
+	CIMXMLParserImpl.java 1.71
+	NEWS 1.399
+	
+Wed Nov 06 10:41:43 CST 2013	blaschke-oss
+
+	2693 ReturnValueNode allows invalid PARAMTYPE attribute
+
+	Node.java 1.15
+	CIMObjectFactory.java 1.20
+	NEWS 1.398
+
+Wed Nov 06 10:34:47 CST 2013	blaschke-oss
+
+	2691 RETURNVALUE should not require PARAMTYPE attribute
+
+	EmbObjHandler.java 1.15
+	CIMXMLParserImpl.java 1.70
+	NEWS 1.397
+
+Wed Nov 06 10:24:19 CST 2013	blaschke-oss
+
+	2537 Add new data types for PARAMVALUE
+
+	CIMXMLParserImpl.java 1.69
+	ParamValueNode.java 1.10
+	NEWS 1.396
+
+Tue Oct 29 08:50:58 CDT 2013	blaschke-oss
+
+	2690 Remove RESPONSEDESTINATION support
+
+	MethodCallNode.java 1.8
+	IMethodCallNode.java 1.9
+	AbstractMethodCallNode.java 1.12
+	NodeFactory.java 1.10
+	NodeConstIf.java 1.13
+	NEWS 1.395
+
+Tue Oct 29 08:33:16 CDT 2013	blaschke-oss
+
+	2689 createMETHODCALL should not add PARAMTYPE attribute
+
+	CIMXMLBuilderImpl.java 1.38
+	CIMClientXML_HelperImpl.java 1.46
+	NEWS 1.394
+
+Tue Oct 29 08:04:04 CDT 2013	blaschke-oss
+
+	2688 parseMETHODCALL looks for CIMName attribute instead of NAME
+
+	CIMXMLParserImpl.java 1.68
+	NEWS 1.393
+
+Tue Oct 29 07:57:06 CDT 2013	blaschke-oss
+
+	2687 ExpParamValueNode allows VALUE, (I)METHODRESPONSE children
+
+	ExpParamValueNode.java 1.8
+	NEWS 1.392
+
+Tue Oct 29 07:50:00 CDT 2013	blaschke-oss
+
+	2686 parseEXPPARAMVALUE allows 2+ children, prohibits 0
+
+	CIMXMLParserImpl.java 1.67
+	NEWS 1.391
+
+Tue Oct 29 07:43:34 CDT 2013	blaschke-oss
+
+	2685 Element.getAttribute returns empty string if no attribute
+
+	CIMXMLParserImpl.java 1.66
+	NEWS 1.390
+
+Tue Oct 29 07:34:21 CDT 2013	blaschke-oss
+
+	2684 parseEXPMETHODRESPONSE has several issues
+
+	CIMXMLParserImpl.java 1.65
+	NEWS 1.389
+
+Tue Oct 29 07:22:24 CDT 2013	blaschke-oss
+
+	2683 KEYVALUE VALUETYPE optional, "string" default
+
+	KeyValueNode.java 1.15
+	CIMXMLParserImpl.java 1.64
+	NEWS 1.388
+
+Tue Oct 29 07:11:59 CDT 2013	blaschke-oss
+
+	2682 (I)MethodCallNode allows no LOCAL*PATH
+
+	MethodCallNode.java 1.7
+	IMethodCallNode.java 1.8
+	AbstractMethodCallNode.java 1.11
+	NEWS 1.387
+
+Tue Oct 29 07:00:09 CDT 2013	blaschke-oss
+
+	2681 parseQUALIFIERDECLARATION does not require TYPE attribute
+
+	SVCEnumQualiTypes.xml 1.3
+	CIMXMLParserImpl.java 1.63
+	NEWS 1.386
+
+Tue Oct 29 06:39:35 CDT 2013	blaschke-oss
+
+	2680 IPARAMVALUE parsing broken on DOM/SAX
+
+	IParamValueNode.java 1.9
+	CIMXMLParserImpl.java 1.62
+	NEWS 1.385
+
+Tue Oct 29 06:28:43 CDT 2013	blaschke-oss
+
+	2679 parseIMETHODCALL requires one IPARAMVALUE child element
+
+	CIMXMLParserImpl.java 1.61
+	NEWS 1.384
+
+Tue Oct 29 06:21:07 CDT 2013	blaschke-oss
+
+	2678 parseMULTI___ allows one SIMPLE___ child element
+
+	CIMXMLParserImpl.java 1.60
+	NEWS 1.383
+
+Tue Oct 29 06:09:56 CDT 2013	blaschke-oss
+
+	2677 ObjectPathNode allows all child nodes
+
+	NEWS 1.382
+	ObjectPathNode.java 1.7
+
+Fri Oct 11 05:34:21 CDT 2013	blaschke-oss
+
+	2676 parseMULTI(EXP)REQ looking for wrong child elements
+
+	CIMXMLParserImpl.java 1.59
+	NEWS 1.381
+
+Fri Oct 11 05:28:14 CDT 2013	blaschke-oss
+
+	2675 CIMXMLParseException messages should contain element name
+
+	CIMXMLParserImpl.java 1.58
+	NEWS 1.380
+
+Fri Oct 11 05:13:10 CDT 2013	blaschke-oss
+
+	2674 Null pointer exception in CIMDateTime(String)
+
+	CIMDateTimeIntervalTest.java 1.10
+	CIMDateTimeAbsoluteTest.java 1.13
+	CIMDateTimeInterval.java 1.25
+	CIMDateTimeAbsolute.java 1.23
+	NEWS 1.379
+
+Fri Oct 11 04:56:55 CDT 2013	blaschke-oss
+
+	2673 NameSpaceNode does not need testCompletness()
+
+	NameSpaceNode.java 1.8
+	NEWS 1.378
+
+Fri Oct 11 04:44:44 CDT 2013	blaschke-oss
+
+	2672 Remove SIMPLEREQACK support
+
+	NodeFactory.java 1.9
+	NodeConstIf.java 1.12
+	NEWS 1.377
+	SimpleRspNode.java 1.11
+
+Wed Oct 09 13:04:10 CDT 2013	blaschke-oss
+
+	2671 Potential null pointer exception in parseERROR
+
+	CIMXMLParserImpl.java 1.57
+	NEWS 1.376
+
+Wed Oct 09 12:48:54 CDT 2013	blaschke-oss
+
+	2670 NAME attribute not required by DOM parser
+
+	CIMXMLParserImpl.java 1.56
+	NEWS 1.375
+
+Wed Oct 09 12:27:00 CDT 2013	blaschke-oss
+
+	2669 Potential null pointer exception in parseMESSAGE
+
+	CIMXMLParserImpl.java 1.55
+	NEWS 1.374
+
+Wed Oct 09 12:18:55 CDT 2013	blaschke-oss
+
+	2668 Potential null pointer exception in parseCIM
+
+	CIMXMLParserImpl.java 1.54
+	NEWS 1.373
+
+Mon Oct 07 04:48:42 CDT 2013	blaschke-oss
+
+	2666 CR12: Remove ENUMERATIONCONTEXT
+
+	EnumerateResponseSAX.java 1.5
+	EnumerateResponsePULL.java 1.3
+	EnumerateResponseDOM.java 1.5
+	NodeConstIf.java 1.11
+	NEWS 1.372
+
 Release 2.2.4
 =============
 

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node MethodResponseNode.java, 1.1.2.13, 1.1.2.14 IMethodResponseNode.java, 1.1.2.11, 1.1.2.12 ParameterNode.java, 1.1.2.8, 1.1.2.9

[Dave B. <bla...@us...>]

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-serv31953/src/org/sblim/cimclient/internal/cimxml/sax/node

Modified Files:
      Tag: Experimental
	MethodResponseNode.java IMethodResponseNode.java 
	ParameterNode.java 
Log Message:
2.2.5 release work

Index: ParameterNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.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
--- ParameterNode.java	11 Nov 2013 22:19:09 -0000	1.1.2.8
+++ ParameterNode.java	12 Dec 2013 15:35:52 -0000	1.1.2.9
@@ -17,7 +17,7 @@
  * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
  * 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)
- *    2704    2013-11-11  blaschke-oss PARAMETER does not require TYPE attribute 
+ *    2704    2013-11-11  blaschke-oss PARAMETER does not require TYPE attribute
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;

Index: IMethodResponseNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- IMethodResponseNode.java	30 Oct 2013 02:05:49 -0000	1.1.2.11
+++ IMethodResponseNode.java	12 Dec 2013 15:35:52 -0000	1.1.2.12
@@ -21,7 +21,7 @@
  * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
  * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
  * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2697    2012-10-29  blaschke-oss (I)MethodResponseNode allows ERROR with PARAMVALUE
+ *    2697    2012-10-30  blaschke-oss (I)MethodResponseNode allows ERROR with PARAMVALUE
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;

Index: MethodResponseNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- MethodResponseNode.java	30 Oct 2013 02:05:49 -0000	1.1.2.13
+++ MethodResponseNode.java	12 Dec 2013 15:35:52 -0000	1.1.2.14
@@ -23,7 +23,7 @@
  * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
  * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
  * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2697    2012-10-29  blaschke-oss (I)MethodResponseNode allows ERROR with PARAMVALUE
+ *    2697    2012-10-30  blaschke-oss (I)MethodResponseNode allows ERROR with PARAMVALUE
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMXMLParserImpl.java, 1.87, 1.88

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30813/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.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- CIMXMLParserImpl.java	12 Dec 2013 11:35:40 -0000	1.87
+++ CIMXMLParserImpl.java	12 Dec 2013 15:19:01 -0000	1.88
@@ -1434,7 +1434,7 @@
 		if (name == null) throw new CIMXMLParseException(
 				"PARAMETER.ARRAY element missing NAME attribute!");
 		if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException(
-				"PARAMETER element missing TYPE attribute!");
+				"PARAMETER.ARRAY element missing TYPE attribute!");
 		String arraySizeStr = pParamE.getAttribute("ARRAYSIZE");
 		try {
 			if (arraySizeStr.length() > 0) Integer.parseInt(arraySizeStr);

[Sblim-commit] jsr48-client NEWS,1.424,1.425

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28813

Modified Files:
	NEWS 
Log Message:
2717 Update detailed release history HTML for 2.2.5

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -d -r1.424 -r1.425
--- NEWS	12 Dec 2013 14:46:35 -0000	1.424
+++ NEWS	12 Dec 2013 14:54:57 -0000	1.425
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+   2717 Update detailed release history HTML for 2.2.5
    2716 Sync up javax.* javadoc with JSR48 1.0.0 Final V
    2719 TCK: CIM APIs should not generate NullPointerException
    2594 CR28: Support CIMErrorDescription HTTP field

[Sblim-commit] jsr48-client NEWS,1.423,1.424

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28287

Modified Files:
	NEWS 
Log Message:
2716 Sync up javax.* javadoc with JSR48 1.0.0 Final V

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- NEWS	12 Dec 2013 13:21:08 -0000	1.423
+++ NEWS	12 Dec 2013 14:46:35 -0000	1.424
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+   2716 Sync up javax.* javadoc with JSR48 1.0.0 Final V
    2719 TCK: CIM APIs should not generate NullPointerException
    2594 CR28: Support CIMErrorDescription HTTP field
    2718 Bad CIMStatusCode generates NumberFormatException

[Sblim-commit] jsr48-client/src/javax/cim UnsignedInteger64.java, 1.12, 1.13 UnsignedInteger8.java, 1.15, 1.16 UnsignedInteger16.java, 1.14, 1.15 CIMClass.java, 1.29, 1.30 UnsignedInteger32.java, 1.14, 1.15

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/javax/cim
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22582/src/javax/cim

Modified Files:
	UnsignedInteger64.java UnsignedInteger8.java 
	UnsignedInteger16.java CIMClass.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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- UnsignedInteger32.java	23 Apr 2010 12:08:23 -0000	1.14
+++ UnsignedInteger32.java	12 Dec 2013 13:21:08 -0000	1.15
@@ -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;
@@ -89,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));
 	}
 
@@ -103,6 +105,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.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- CIMClass.java	13 Sep 2012 09:29:24 -0000	1.29
+++ CIMClass.java	12 Dec 2013 13:21:08 -0000	1.30
@@ -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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- UnsignedInteger16.java	23 Apr 2010 12:08:23 -0000	1.14
+++ UnsignedInteger16.java	12 Dec 2013 13:21:08 -0000	1.15
@@ -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;
@@ -89,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));
 	}
 
@@ -103,6 +105,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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- UnsignedInteger64.java	23 Apr 2010 12:13:38 -0000	1.12
+++ UnsignedInteger64.java	12 Dec 2013 13:21:08 -0000	1.13
@@ -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 IllegalArgumentException("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 IllegalArgumentException("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 IllegalArgumentException("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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- UnsignedInteger8.java	23 Apr 2010 12:08:23 -0000	1.15
+++ UnsignedInteger8.java	12 Dec 2013 13:21:08 -0000	1.16
@@ -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;
@@ -91,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));
 	}
 
@@ -105,6 +107,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;

[Sblim-commit] jsr48-client NEWS,1.421,1.422

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17991

Modified Files:
	NEWS 
Log Message:
2594 CR28: Support CIMErrorDescription HTTP field

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -d -r1.421 -r1.422
--- NEWS	12 Dec 2013 11:57:47 -0000	1.421
+++ NEWS	12 Dec 2013 12:09:04 -0000	1.422
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+   2594 CR28: Support CIMErrorDescription HTTP field
    2718 Bad CIMStatusCode generates NumberFormatException
    2538 CR14: Support new CORRELATOR element
    2715 Add VALUE.NULL support

[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/http HttpHeaderTest.java, 1.6, 1.7

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/http
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17388/utst/org/sblim/cimclient/unittest/http

Modified Files:
	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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- HttpHeaderTest.java	11 Mar 2009 13:52:54 -0000	1.6
+++ HttpHeaderTest.java	12 Dec 2013 11:57:47 -0000	1.7
@@ -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 'one' as 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 'one' as 1st 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 'one' as 2nd 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;
 			}

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMXMLParserImpl.java, 1.86, 1.87

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16104/src/org/sblim/cimclient/internal/cimxml

Modified Files:
	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.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- CIMXMLParserImpl.java	10 Dec 2013 16:22:00 -0000	1.86
+++ CIMXMLParserImpl.java	12 Dec 2013 11:35:40 -0000	1.87
@@ -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;
@@ -2676,6 +2677,8 @@
 		throw new CIMXMLParseException("MULTIRSP element missing SIMPLERSP child element!");
 	}
 
+	private static final String nodesSIMPLEREQ[] = { "CORRELATOR", "METHODCALL", "IMETHODCALL" };
+
 	/**
 	 * parseSIMPLEREQ
 	 * 
@@ -2684,17 +2687,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;
 	}
 
 	/**
@@ -2846,6 +2868,8 @@
 		return request;
 	}
 
+	private static final String nodesSIMPLEEXPREQ[] = { "CORRELATOR", "EXPMETHODCALL" };
+
 	/**
 	 * parseSIMPLEEXPREQ
 	 * 
@@ -2854,13 +2878,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;
 	}
 
 	/**
@@ -3471,7 +3511,7 @@
 				"SIMPLEREQ", "SIMPLEEXPREQ", "IMETHODCALL", "METHODCALL", "EXPMETHODCALL",
 				"PARAMVALUE", "IPARAMVALUE", "EXPPARAMVALUE", "MULTIRSP", "MULTIEXPRSP",
 				"SIMPLERSP", "SIMPLEEXPRSP", "METHODRESPONSE", "EXPMETHODRESPONSE",
-				"IMETHODRESPONSE", "ERROR", "RETURNVALUE", "IRETURNVALUE" });
+				"IMETHODRESPONSE", "ERROR", "RETURNVALUE", "IRETURNVALUE", "CORRELATOR" });
 	}
 
 	/**
@@ -3792,4 +3832,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);
+	}
 }

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. 048e3abfb52f6ae5a5b15e33f482405c34a9fb4e

[Dave H. <hel...@us...>]

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_1.3 has been updated
       via  048e3abfb52f6ae5a5b15e33f482405c34a9fb4e (commit)
      from  93a908cd8ab0e74d22a70849824453c3bb6d45b7 (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 048e3abfb52f6ae5a5b15e33f482405c34a9fb4e
Author: Dave Heller <hel...@us...>
Date:   Wed Dec 11 17:34:08 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 92063ae..8d8fe86 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -1458,6 +1458,7 @@ CMPIStatus InteropProviderInvokeMethod(
             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;
@@ -1473,6 +1474,14 @@ CMPIStatus InteropProviderInvokeMethod(
             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));
             if (pcrc) 


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker