sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] sfcb providerDrv.c,1.100,1.101

[Narasimha S. <nsh...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv7433

Modified Files:
	providerDrv.c 
Log Message:
[3413031] fixes to perform check before calling free


Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- providerDrv.c	24 Jun 2011 23:54:15 -0000	1.100
+++ providerDrv.c	23 Sep 2011 20:20:07 -0000	1.101
@@ -2889,6 +2889,7 @@
       _SFCB_TRACE(1, ("--- Waiting for provider request to R%d-%lu",
                    providerSockets.receive,getInode(providerSockets.receive)));
       parms = (Parms *) malloc(sizeof(*parms));
+      memset(parms, 0, sizeof(*parms));
       
       rc = spRecvReq(&providerSockets.receive, &parms->requestor,
                      (void **) &parms->req, &rl, &mqg);

[Sblim-commit] sfcb support.c,1.37,1.38

[Narasimha S. <nsh...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv7365

Modified Files:
	support.c 
Log Message:
[3413031] fixes to perform check before calling free


Index: support.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/support.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- support.c	21 Jun 2011 22:50:59 -0000	1.37
+++ support.c	23 Sep 2011 20:19:31 -0000	1.38
@@ -410,9 +410,11 @@
      mt->cleanupDone = 1;
      __flush_mt(mt);
      
-     if (mt->hc.memObjs) free(mt->hc.memObjs);
-     if (mt->hc.memEncObjs) free(mt->hc.memEncObjs);
-     free(mt);
+     if (mt->hc.memObjs) 
+       { free(mt->hc.memObjs); mt->hc.memObjs = NULL; }
+     if (mt->hc.memEncObjs)
+       { free(mt->hc.memEncObjs); mt->hc.memEncObjs = NULL; }
+     if (mt) { free(mt); mt = NULL; }
    }
    _SFCB_EXIT();
 }
@@ -684,12 +686,15 @@
    
    __flush_mt(mt);
    
-   if (mt->hc.memObjs) free(mt->hc.memObjs);
-   if (mt->hc.memEncObjs) free(mt->hc.memEncObjs);
+   if (mt->hc.memObjs) { free(mt->hc.memObjs); mt->hc.memObjs = NULL; }
+   if (mt->hc.memEncObjs) { free(mt->hc.memEncObjs); mt->hc.memEncObjs = NULL; }
    
+   if (hc) {
    memcpy(&mt->hc,hc,sizeof(HeapControl));
    
    free(hc);
+   hc = NULL;
+   }
    _SFCB_EXIT();
 }
 

[Sblim-commit] sfcb result.c,1.16,1.17

[Narasimha S. <nsh...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv7230

Modified Files:
	result.c 
Log Message:
[3413031] fixes to perform check before calling free


Index: result.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/result.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- result.c	17 Feb 2011 21:22:23 -0000	1.16
+++ result.c	23 Sep 2011 20:18:46 -0000	1.17
@@ -168,9 +168,9 @@
 {
    NativeResult *nr = (NativeResult*) result;
 
-   free(nr->data);
-   free(nr->resp);
-   free(result);
+   if (nr->data) { free(nr->data); nr->data = NULL; }
+   if (nr->resp) { free(nr->resp); nr->resp = NULL; }
+   if (result) { free(result); result = NULL; }
 
    CMReturn(CMPI_RC_OK);
 }
@@ -284,13 +284,13 @@
 
    if (isInst) {
       size=getInstanceSerializedSize(instance);
-      ptr=nextResultBufferPos(r, MSG_SEG_INSTANCE, size);
+      ptr=nextResultBufferPos(r, MSG_SEG_INSTANCE, (unsigned long)size);
       _SFCB_TRACE(1,("--- Moving instance %d",size));
       getSerializedInstance(instance,ptr); /* memcpy inst to ptr */
    }
    else {
       size=getConstClassSerializedSize((CMPIConstClass*)instance);
-      ptr=nextResultBufferPos(r, MSG_SEG_CONSTCLASS, size);
+      ptr=nextResultBufferPos(r, MSG_SEG_CONSTCLASS, (unsigned long)size);
       _SFCB_TRACE(1,("--- Moving class %d",size));
       getSerializedConstClass((CMPIConstClass*)instance,ptr);
    }

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-140-gcef7763

[Narasimha S. <nsh...@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  cef7763a00d57524e2e518efdf8ee7a3290ca84d (commit)
      from  b5bfde178bb0fb8db2f6aa77a8853b5536210d90 (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 cef7763a00d57524e2e518efdf8ee7a3290ca84d
Author: Narasimha Sharoff <nsh...@us...>
Date:   Thu Sep 22 13:22:12 2011 -0700

    [3413031]  fixes to perform check before calling free

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index abaa502..698ff67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-22 Narasimha Sharoff <nsh...@us...>
+
+	* providerDrv.c, result.c, support.c
+	[ 3413031 ] fixes to perform check before calling free
+
 2011-09-09 Michael Chase-Salerno <br...@li...>
 
 	* httpAdapter.c, sfcb.cfg.pre.in, control.c:
diff --git a/NEWS b/NEWS
index 6ff0072..1446b58 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ Bugs fixed:
 - 3101157 Failed to enable provider timing analysis with SfcbLocal
 - 3400114 sfcb fails to start with ipv6 disabled
 - 3310192 32bit sfcbmof fails to run x86_64
+- 3413031 fixes to perform check before calling free
 
 Changes in 1.4.1
 ================
diff --git a/providerDrv.c b/providerDrv.c
index 04099da..38f4335 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -3338,6 +3338,7 @@ processProviderInvocationRequests(char *name)
                     providerSockets.receive,
                     getInode(providerSockets.receive)));
     parms = (Parms *) malloc(sizeof(*parms));
+    memset(parms, 0, sizeof(*parms));
 
     rc = spRecvReq(&providerSockets.receive, &parms->requestor,
                    (void **) &parms->req, &rl, &mqg);
diff --git a/result.c b/result.c
index f10f65c..3a5edd3 100644
--- a/result.c
+++ b/result.c
@@ -208,9 +208,9 @@ __rft_release(CMPIResult *result)
 {
   NativeResult   *nr = (NativeResult *) result;
 
-  free(nr->data);
-  free(nr->resp);
-  free(result);
+  if (nr->data) { free(nr->data); nr->data = NULL; }
+  if (nr->resp) { free(nr->resp); nr->resp = NULL; }
+  if (result)   { free(result); result = NULL; }
 
   CMReturn(CMPI_RC_OK);
 }
@@ -335,12 +335,12 @@ __rft_returnInstance(const CMPIResult *result,
 
   if (isInst) {
     size = getInstanceSerializedSize(instance);
-    ptr = nextResultBufferPos(r, MSG_SEG_INSTANCE, size);
+    ptr = nextResultBufferPos(r, MSG_SEG_INSTANCE, (unsigned long)size);
     _SFCB_TRACE(1, ("--- Moving instance %d", size));
     getSerializedInstance(instance, ptr);       /* memcpy inst to ptr */
   } else {
     size = getConstClassSerializedSize((CMPIConstClass *) instance);
-    ptr = nextResultBufferPos(r, MSG_SEG_CONSTCLASS, size);
+    ptr = nextResultBufferPos(r, MSG_SEG_CONSTCLASS, (unsigned long)size);
     _SFCB_TRACE(1, ("--- Moving class %d", size));
     getSerializedConstClass((CMPIConstClass *) instance, ptr);
   }
diff --git a/support.c b/support.c
index 801242f..3afb052 100644
--- a/support.c
+++ b/support.c
@@ -413,11 +413,11 @@ __cleanup_mt(void *ptr)
     __flush_mt(mt);
 
     if (mt->hc.memObjs)
-      free(mt->hc.memObjs);
+      { free(mt->hc.memObjs); mt->hc.memObjs = NULL; }
     if (mt->hc.memEncObjs)
-      free(mt->hc.memEncObjs);
+      { free(mt->hc.memEncObjs); mt->hc.memEncObjs = NULL; }
 
-    free(mt);
+    if (mt) { free(mt); mt = NULL; }
   }
   _SFCB_EXIT();
 }
@@ -720,13 +720,16 @@ releaseHeap(void *hc)
   __flush_mt(mt);
 
   if (mt->hc.memObjs)
-    free(mt->hc.memObjs);
+    { free(mt->hc.memObjs); mt->hc.memObjs = NULL; }
   if (mt->hc.memEncObjs)
-    free(mt->hc.memEncObjs);
+    { free(mt->hc.memEncObjs); mt->hc.memEncObjs = NULL; }
 
+  if (hc) {
   memcpy(&mt->hc, hc, sizeof(HeapControl));
 
   free(hc);
+  hc = NULL; 
+  }
   _SFCB_EXIT();
 }
 


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

[Sblim-commit] gather NEWS,1.106,1.107

[Tyrel D. <ty...@us...>]

Update of /cvsroot/sblim/gather
In directory vz-cvs-3.sog:/tmp/cvs-serv17749

Modified Files:
	NEWS 
Log Message:
Rolled back 3397109: UnixProcess plugins occasionally crashes


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/gather/NEWS,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- NEWS	21 Sep 2011 21:38:38 -0000	1.106
+++ NEWS	22 Sep 2011 23:40:09 -0000	1.107
@@ -3,7 +3,6 @@
 
 Bugs fixed:
 - 3394202 large network counters overflow raw metric buffer
-- 3397109 gcc extensions not available on new distros
 - 3412635 bad string allocations
 
 Changes in Version 2.2.3

[Sblim-commit] gather/plugin metricVirt.c,1.12,1.13

[Tyrel D. <ty...@us...>]

Update of /cvsroot/sblim/gather/plugin
In directory vz-cvs-3.sog:/tmp/cvs-serv26516/plugin

Modified Files:
	metricVirt.c 
Log Message:
Fixed 3412635: bad string allocations


Index: metricVirt.c
===================================================================
RCS file: /cvsroot/sblim/gather/plugin/metricVirt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- metricVirt.c	16 May 2011 07:00:50 -0000	1.12
+++ metricVirt.c	21 Sep 2011 21:38:38 -0000	1.13
@@ -321,7 +321,7 @@
 		domain_statistics.domain_id[cnt] = *ids_ptr;
 		
 		domain_statistics.domain_name[cnt] = realloc(domain_statistics.domain_name[cnt], 
-                    sizeof(char *) * (strlen(virDomainGetName(domain)+1)));
+                    sizeof(char *) * (strlen(virDomainGetName(domain)) + 1));
 
         strcpy(domain_statistics.domain_name[cnt],virDomainGetName(domain));
 
@@ -366,7 +366,7 @@
 	{
 		domain = virDomainLookupByName(conn, *(defdomlist + j));
 		domain_statistics.domain_name[cnt] = realloc(domain_statistics.domain_name[cnt], 
-                    sizeof(char *) * (strlen(*(defdomlist + j)+1)));
+                    sizeof(char *) * (strlen(*(defdomlist + j)) + 1));
 		
         strcpy(domain_statistics.domain_name[cnt], *(defdomlist + j));
 

[Sblim-commit] sfcb ChangeLog, 1.685, 1.686 NEWS, 1.609, 1.610 Makefile.am, 1.112, 1.113

[Chris B. <buc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv22117

Modified Files:
	ChangeLog NEWS Makefile.am 
Log Message:
[ 3412033 ] New files from 3313833 missed release tarball

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -d -r1.609 -r1.610
--- NEWS	9 Sep 2011 22:54:18 -0000	1.609
+++ NEWS	21 Sep 2011 14:50:20 -0000	1.610
@@ -12,6 +12,7 @@
 - 3393324 sfcb process abort in IndCIMXMLHandlerInvokeMethod
 - 3398337 Namespaces of filter and handler for IndSub not checked
 - 3400114 sfcb fails to start with ipv6 disabled
+- 3412033 New files from 3313833 missed release tarball
 
 Changes in 1.3.12
 =================

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/Makefile.am,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- Makefile.am	29 Jun 2011 17:33:01 -0000	1.112
+++ Makefile.am	21 Sep 2011 14:50:20 -0000	1.113
@@ -126,6 +126,12 @@
     PAM_LIBS =
 endif
 
+if ACCOUNT_PASSTHRU
+    ACCOUNT_PASSTHRU_LIBS = libsfccimAccountPassthroughProvider.la 
+else
+    ACCOUNT_PASSTHRU_LIBS = 
+endif
+
 sfcb_sharedobjects = \
    $(sfcblibdir)/*.so
 
@@ -151,7 +157,8 @@
    $(QUALREP_LIBS) \
    $(INDICATION_LIBS) \
    $(PAM_LIBS) \
-   $(SLP_HOSTNAME_LIBS)
+   $(SLP_HOSTNAME_LIBS) \
+   $(ACCOUNT_PASSTHRU_LIBS) 
 
 if TEST_ENABLED 
 sfcblib_LTLIBRARIES += \
@@ -332,6 +339,12 @@
 libsfcElementCapabilitiesProvider_la_LIBADD=-lsfcBrokerCore
 libsfcElementCapabilitiesProvider_la_DEPENDENCIES=libsfcBrokerCore.la
 
+if ACCOUNT_PASSTHRU
+libsfccimAccountPassthroughProvider_la_SOURCES = cimAccountPassthroughProvider.c
+libsfccimAccountPassthroughProvider_la_LIBADD=-lsfcBrokerCore
+libsfccimAccountPassthroughProvider_la_DEPENDENCIES=libsfcBrokerCore.la
+endif
+
 libsfcClassProviderGz_la_SOURCES = \
    classProviderGz.c
 libsfcClassProviderGz_la_LIBADD=-lsfcBrokerCore @SFCB_LIBZ@
@@ -454,7 +467,13 @@
 
 dist_sfcbdata_SCRIPTS=genSslCert.sh getSchema.sh test/stageschema.sh
 
-dist_sfcbdata_DATA=default.reg 10_interop.mof 20_indication.mof indication.mof
+if ACCOUNT_PASSTHRU
+ACCOUNT_PASSTHRU_MOF = cimAccountPassthrough.mof
+else
+ACCOUNT_PASSTHRU_MOF = 
+endif
+
+dist_sfcbdata_DATA=default.reg 10_interop.mof 20_indication.mof indication.mof $(ACCOUNT_PASSTHRU_MOF)
 
 nodist_bin_SCRIPTS=sfcbrepos sfcbstage sfcbunstage sfcbuuid
 
@@ -539,6 +558,9 @@
 	$(INSTALL_DATA) $(srcdir)/20_indication.mof $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop
 	$(INSTALL_DATA) $(srcdir)/indication.mof $(DESTDIR)$(sfcbstatedir)/stage/mofs
 endif
+if ACCOUNT_PASSTHRU
+	$(INSTALL_DATA) $(srcdir)/cimAccountPassthrough.mof $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop
+endif
 if DOCS
 	test -d $(DESTDIR)$(sfcbdocdir)/html || $(mkdir_p) $(DESTDIR)$(sfcbdocdir)/html
 	$(INSTALL) -m 644 $(srcdir)/doc/html/* $(DESTDIR)$(sfcbdocdir)/html

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -d -r1.685 -r1.686
--- ChangeLog	9 Sep 2011 22:54:18 -0000	1.685
+++ ChangeLog	21 Sep 2011 14:50:20 -0000	1.686
@@ -1,3 +1,8 @@
+2011-09-21  Chris Buccella  <buc...@li...>
+
+	* Makefile.am:
+	[ 3412033 ] New files from 3313833 missed release tarball
+
 2011-09-09 Michael Chase-Salerno <br...@li...>
 
 	* httpAdapter.c, sfcb.cfg.pre.in, control.c:

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

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory vz-cvs-3.sog:/tmp/cvs-serv1110/src/org/sblim/cimclient/internal/cimxml

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
3411944 - createJavaObject exception with hex uint

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.32
retrieving revision 1.14.2.33
diff -u -d -r1.14.2.32 -r1.14.2.33
--- CIMXMLParserImpl.java	3 May 2011 18:10:17 -0000	1.14.2.32
+++ CIMXMLParserImpl.java	20 Sep 2011 19:36:44 -0000	1.14.2.33
@@ -49,6 +49,7 @@
  * 3027615    2010-07-12  blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
  * 3293248    2011-05-03  blaschke-oss Support for CIM_ERROR instances within ERROR
  * 3297028    2011-05-03  blaschke-oss Instances contain CIMClassProperty with DOM parser
+ * 3411944    2011-09-20  blaschke-oss createJavaObject exception with hex uint
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -2982,7 +2983,7 @@
 		CIMDataType cimType = parseTypeStr(pTypeStr, false);
 		int radix = 10;
 
-		if (pTypeStr.toLowerCase().startsWith("sint") || pTypeStr.toLowerCase().startsWith("int")) {
+		if (pTypeStr.toLowerCase().startsWith("sint") || pTypeStr.toLowerCase().startsWith("uint")) {
 			pValue = pValue.toLowerCase();
 			if (pValue.startsWith("0x") || pValue.startsWith("+0x") || pValue.startsWith("-0x")) {
 				radix = 16;

[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/wbem CIMBuilder.java, 1.7.2.14, 1.7.2.15

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

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv31944/utst/org/sblim/cimclient/unittest/wbem

Modified Files:
      Tag: Experimental
	CIMBuilder.java 
Log Message:
3411879 - TCK: CIM element value must match type

Index: CIMBuilder.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/CIMBuilder.java,v
retrieving revision 1.7.2.14
retrieving revision 1.7.2.15
diff -u -d -r1.7.2.14 -r1.7.2.15
--- CIMBuilder.java	1 Jun 2009 17:01:07 -0000	1.7.2.14
+++ CIMBuilder.java	20 Sep 2011 15:53:14 -0000	1.7.2.15
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2011
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -25,6 +25,7 @@
  * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
  * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
  * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3411879    2011-09-20  blaschke-oss TCK: CIM element value must match type
  */
 
 package org.sblim.cimclient.unittest.wbem;
@@ -467,6 +468,21 @@
 		return cInstA;
 	}
 
+	/*
+	 * According to DSP0201, the following CIM data types cannot have null
+	 * values (i.e. uint32 MUST contain at least one digit)
+	 */
+	private static int cInvalidNullTypes[] = { CIMDataType.BOOLEAN, CIMDataType.CHAR16,
+			CIMDataType.DATETIME, CIMDataType.REAL32, CIMDataType.REAL64, CIMDataType.SINT16,
+			CIMDataType.SINT32, CIMDataType.SINT64, CIMDataType.SINT8, CIMDataType.UINT16,
+			CIMDataType.UINT32, CIMDataType.UINT64, CIMDataType.UINT8 };
+
+	private static boolean isInvalidNullType(int pType) {
+		for (int i = cInvalidNullTypes.length - 1; i >= 0; i--)
+			if (cInvalidNullTypes[i] == pType) return true;
+		return false;
+	}
+
 	private static CIMProperty<?>[] cKeyPropA;
 
 	private static CIMProperty<?>[] cAllPropA;
@@ -503,7 +519,8 @@
 			CIMProperty<Object> prop = new CIMProperty<Object>("KeyProp" + i, pair.getType(), pair
 					.getValue(), true, bit(i, 0), bit(i, 1) ? "KeyPropOrigin" + i : null);
 			cKeyPropA[i] = cAllPropA[i] = prop;
-			if (i >= cKeyPropA.length / 2 && pair.getType().getType() != CIMDataType.REFERENCE) {
+			if (i >= cKeyPropA.length / 2 && pair.getType().getType() != CIMDataType.REFERENCE
+					&& !isInvalidNullType(pair.getType().getType())) {
 				CIMProperty<Object> propNull = new CIMProperty<Object>("KeyProp" + i, pair
 						.getType(), null, true, bit(i, 0), bit(i, 1) ? "KeyPropOrigin" + i : null);
 				cKeyPropNullA[i] = cAllPropNullA[i] = propNull;

[Sblim-commit] jsr48-client/src/javax/cim CIMElement.java, 1.3.2.11, 1.3.2.12

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

Update of /cvsroot/sblim/jsr48-client/src/javax/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv25838/src/javax/cim

Modified Files:
      Tag: Experimental
	CIMElement.java 
Log Message:
3410126 - TCK: CIM element name cannot be null

Index: CIMElement.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMElement.java,v
retrieving revision 1.3.2.11
retrieving revision 1.3.2.12
diff -u -d -r1.3.2.11 -r1.3.2.12
--- CIMElement.java	5 Feb 2010 20:41:53 -0000	1.3.2.11
+++ CIMElement.java	15 Sep 2011 22:13:05 -0000	1.3.2.12
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2011
  *
  * 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 @@
  * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
  * 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
  */
 
 package javax.cim;
@@ -48,6 +49,7 @@
 	 *            The string for the name of the element.
 	 */
 	public CIMElement(String pName) {
+		if (pName == null) throw new IllegalArgumentException("CIM element name cannot be null");
 		this.iName = pName;
 	}
 

[Sblim-commit] jsr48-client build.xml, 1.45, 1.45.2.1 sblim-cim-client2.spec, 1.23, 1.23.2.1

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

Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv1377

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

Index: sblim-cim-client2.spec
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -d -r1.23 -r1.23.2.1
--- sblim-cim-client2.spec	15 Sep 2011 11:19:59 -0000	1.23
+++ sblim-cim-client2.spec	15 Sep 2011 14:12:55 -0000	1.23.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.1.10
 %define release                 1jpp
 %define section                 free
 

Index: build.xml
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/build.xml,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -u -d -r1.45 -r1.45.2.1
--- build.xml	15 Sep 2011 11:19:59 -0000	1.45
+++ build.xml	15 Sep 2011 14:12:55 -0000	1.45.2.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, 2011" />
-    <property name="Manifest.version" value="HEAD" />
+    <property name="Manifest.version" value="2.1.10" />
 
     <property name="Directory.source.core" value="${basedir}/src" />
     <property name="Directory.source.samples" value="${basedir}/smpl" />

[Sblim-commit] jsr48-client ChangeLog, 1.21, 1.22 build.xml, 1.44, 1.45 sblim-cim-client2.spec, 1.22, 1.23 NEWS, 1.238, 1.239

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

Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv14312

Modified Files:
	ChangeLog build.xml sblim-cim-client2.spec NEWS 
Log Message:
2.1.10 release work

Index: sblim-cim-client2.spec
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sblim-cim-client2.spec	15 Jun 2011 11:12:06 -0000	1.22
+++ sblim-cim-client2.spec	15 Sep 2011 11:19:59 -0000	1.23
@@ -158,6 +158,18 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Sep 15 2011 Dave Blaschke <bla...@us...>
+- New release 2.1.10
+  o 3409691 2.1.10 packaging issues: rpmbuild broken on Red Hat
+  o 3406275 HEAD branch ONLY: sync with Experimental branch
+  o 3400209 Highlighted Static Analysis (PMD) issues
+  o 3397922 support OctetString
+  o 3390724 Problem with Reliable Indication support in the Listener
+  o 3374012 Sblim client CIMObjectPath class defect for LLA format URL
+  o 3376657 Get reliable indication properties once
+  o 3374206 NullPointerException caused by Indication
+  o 3323310 Need the ability to override certain Global Properties
+  
 * Wed Jun 15 2011 Dave Blaschke <bla...@us...>
 - New release 2.1.9
   o 3311279 Repeated Instantiation of SAXParserFactory

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- NEWS	15 Sep 2011 00:46:13 -0000	1.238
+++ NEWS	15 Sep 2011 11:19:59 -0000	1.239
@@ -1,14 +1,14 @@
-Changes in HEAD
+Version 2.1.10
 ================
 3409691 2.1.10 packaging issues: rpmbuild broken on Red Hat
-3323310 Need the ability to override certain Global Properties
-3374206 NullPointerException caused by Indication
-3376657 Get reliable indication properties once
-3374012 Sblim client CIMObjectPath class defect for LLA format URL
-3390724 Problem with Reliable Indication support in the Listener
-3397922 support OctetString
-3400209 Highlighted Static Analysis (PMD) issues
 3406275 HEAD branch ONLY: sync with Experimental branch
+3400209 Highlighted Static Analysis (PMD) issues
+3397922 support OctetString
+3390724 Problem with Reliable Indication support in the Listener
+3374012 Sblim client CIMObjectPath class defect for LLA format URL
+3376657 Get reliable indication properties once
+3374206 NullPointerException caused by Indication
+3323310 Need the ability to override certain Global Properties
 
 Version 2.1.9
 ================

Index: build.xml
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/build.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- build.xml	15 Sep 2011 00:30:13 -0000	1.44
+++ build.xml	15 Sep 2011 11:19:59 -0000	1.45
@@ -344,7 +344,6 @@
         </zip> 
     </target>
 
-
 	<target name="unittest" depends="build_utst" description="Executes the unit test package">
     	<property name="Test.console" value="VERBOSE" />
 		<java classname="org.sblim.cimclient.unittest.TestSuite" fork="true" resultproperty="result" failonerror="false">

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ChangeLog	15 Jun 2011 11:12:06 -0000	1.21
+++ ChangeLog	15 Sep 2011 11:19:59 -0000	1.22
@@ -1,3 +1,93 @@
+Release 2.1.10
+==============
+
+Wed Sep 14 19:30:13 CDT 2011	blaschke-oss
+
+	3409691 2.1.10 packaging issues: rpmbuild broken on Red Hat
+
+	build.xml 1.44
+	NEWS 1.238
+
+Thu Sep 08 09:42:15 CDT 2011	blaschke-oss
+
+	3406275 HEAD branch ONLY: sync with Experimental branch
+
+	WBEMClientCIMXML.java 1.65
+	Authority.java 1.13
+	CIMClientXML_HelperImpl.java 1.40
+	NEWS 1.237
+
+Thu Sep 08 08:03:52 CDT 2011	blaschke-oss
+
+	3400209 Highlighted Static Analysis (PMD) issues
+
+	CIMValuedElement.java 1.13
+	CIMTypedElement.java 1.13
+	CIMQualifierType.java 1.13
+	CIMQualifier.java 1.15
+	CIMProperty.java 1.17
+	CIMParameter.java 1.17
+	CIMMethod.java 1.19
+	CIMDateTimeInterval.java 1.23
+	CIMDateTimeAbsolute.java 1.21
+	CIMClassProperty.java 1.20
+	CIMClass.java 1.25
+	CIMArgument.java 1.11
+	TRC.java 1.6
+	LogAndTraceBroker.java 1.22
+	HttpClientPool.java 1.13
+	HttpClient.java 1.37
+	WBEMListenerSBLIM.java 1.14
+	NEWS 1.236
+
+Thu Sep 08 06:32:24 CDT 2011	blaschke-oss
+
+	3397922 support OctetString
+
+	unittest.html 1.13
+	testcases.cim.txt 1.7
+	CIMOctetStringTest.java 1.2
+	CIMOctetString.java 1.2
+	NEWS 1.235
+
+Tue Sep 06 06:20:54 CDT 2011	blaschke-oss
+
+	3390724 Problem with Reliable Indication support in the Listener
+
+	CIMIndicationHandler.java 1.25
+	NEWS 1.234
+
+Wed Aug 10 07:14:17 CDT 2011	blaschke-oss
+
+	3374012 Sblim client CIMObjectPath class defect for LLA format URL
+
+	CIMObjectPathTest.java 1.14
+	Authority.java 1.12
+	NEWS 1.233
+
+Wed Aug 10 07:03:30 CDT 2011	blaschke-oss
+
+	3376657 Get reliable indication properties once
+
+	ReliableIndicationHandler.java 1.3
+	CIMIndicationHandler.java 1.24
+	NEWS 1.232
+
+Wed Aug 10 06:52:13 CDT 2011	blaschke-oss
+
+	3374206 NullPointerException caused by Indication
+
+	CIMIndicationHandler.java 1.23
+	Jsr48PegasusIndicationSample.java 1.5
+	NEWS 1.231
+
+Thu Jul 21 11:34:28 CDT 2011	blaschke-oss
+
+	3323310 Need the ability to override certain Global Properties
+
+	HttpClient.java 1.36
+	NEWS 1.230
+	
 Release 2.1.9
 =============
 

[Sblim-commit] jsr48-client NEWS,1.237,1.238

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

Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv32483

Modified Files:
	NEWS 
Log Message:
3409691 - 2.1.10 packaging issues: rpmbuild broken on Red Hat

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- NEWS	8 Sep 2011 14:47:24 -0000	1.237
+++ NEWS	15 Sep 2011 00:46:13 -0000	1.238
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+3409691 2.1.10 packaging issues: rpmbuild broken on Red Hat
 3323310 Need the ability to override certain Global Properties
 3374206 NullPointerException caused by Indication
 3376657 Get reliable indication properties once

[Sblim-commit] jsr48-client build.xml,1.43,1.44

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

Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv29934

Modified Files:
	build.xml 
Log Message:
3409691 - 2.0.10 packaging issues: rpmbuild broken on Red Hat

Index: build.xml
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- build.xml	15 Feb 2011 12:42:35 -0000	1.43
+++ build.xml	15 Sep 2011 00:30:13 -0000	1.44
@@ -183,6 +183,7 @@
     	<mkdir dir="${Directory.build.doc}"/>
         <javadoc sourcepath="${Directory.source.core}"
     	         destdir="${Directory.build.doc}"
+                 packagenames="javax.*, org.sblim.*"
                  version="true"
                  author="true"
                  use="true"

[Sblim-commit] jsr48-client build.xml,1.22.2.26,1.22.2.27

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

Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv23922

Modified Files:
      Tag: Experimental
	build.xml 
Log Message:
3409691 - 2.0.10 packaging issues: rpmbuild broken on Red Hat

Index: build.xml
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/build.xml,v
retrieving revision 1.22.2.26
retrieving revision 1.22.2.27
diff -u -d -r1.22.2.26 -r1.22.2.27
--- build.xml	13 Jan 2011 16:15:42 -0000	1.22.2.26
+++ build.xml	15 Sep 2011 00:15:31 -0000	1.22.2.27
@@ -203,6 +203,7 @@
     	<mkdir dir="${Directory.build.doc}"/>
         <javadoc sourcepath="${Directory.source.core}"
     	         destdir="${Directory.build.doc}"
+                 packagenames="javax.*, org.sblim.*"
                  version="true"
                  author="true"
                  use="true"

[Sblim-commit] sfcb ChangeLog, 1.684, 1.685 NEWS, 1.608, 1.609 README, 1.56, 1.57 control.c, 1.39, 1.40 httpAdapter.c, 1.92, 1.93 sfcb.cfg.pre.in, 1.26, 1.27

[Michael Chase-S. <mc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv28646

Modified Files:
	ChangeLog NEWS README control.c httpAdapter.c sfcb.cfg.pre.in 
Log Message:
[ 3406825 ] Make ssl cipher list configurable


Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -d -r1.684 -r1.685
--- ChangeLog	9 Sep 2011 21:32:43 -0000	1.684
+++ ChangeLog	9 Sep 2011 22:54:18 -0000	1.685
@@ -1,6 +1,11 @@
 2011-09-09 Michael Chase-Salerno <br...@li...>
 
 	* httpAdapter.c, sfcb.cfg.pre.in, control.c:
+	[ 3406825 ] Make ssl cipher list configurable
+
+2011-09-09 Michael Chase-Salerno <br...@li...>
+
+	* httpAdapter.c, sfcb.cfg.pre.in, control.c:
 	[ 3406823 ] Make select timeout a config option.
 
 2011-09-06 Michael Chase-Salerno <br...@li...>

Index: sfcb.cfg.pre.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sfcb.cfg.pre.in	9 Sep 2011 21:32:43 -0000	1.26
+++ sfcb.cfg.pre.in	9 Sep 2011 22:54:18 -0000	1.27
@@ -183,6 +183,11 @@
 ## Default is sfcCertificateAuthentication
 certificateAuthLib:   sfcCertificateAuthentication
 
+## List of SSL ciphers to enable.
+## Default is "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" which disables
+##      weak ciphers.
+sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
+
 ##---------------------------------- UDS --------------------------------------
 ## These options only apply if configured with --enable-uds
 

Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- httpAdapter.c	9 Sep 2011 21:32:43 -0000	1.92
+++ httpAdapter.c	9 Sep 2011 22:54:18 -0000	1.93
@@ -1421,7 +1421,8 @@
   char           *fnc,
                  *fnk,
                  *fnt,
-                 *fnl;
+                 *fnl,
+                 *sslCiphers;
   int             rc;
   ctx = SSL_CTX_new(SSLv23_method());
   getControlChars("sslCertificateFilePath", &fnc);
@@ -1467,10 +1468,11 @@
   SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 |
                       SSL_OP_SINGLE_DH_USE);
   /*
-   * disable weak ciphers 
+   * Set valid ciphers
    */
-  if (SSL_CTX_set_cipher_list(ctx, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH")
-      != 1)
+  getControlChars("sslCiphers", &sslCiphers);
+  _SFCB_TRACE(1, ("---  sslCiphers = %s", sslCiphers));
+  if (SSL_CTX_set_cipher_list(ctx, sslCiphers) != 1)
     intSSLerror("Error setting cipher list (no valid ciphers)");
 
 }

Index: README
===================================================================
RCS file: /cvsroot/sblim/sfcb/README,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- README	9 Sep 2011 21:32:43 -0000	1.56
+++ README	9 Sep 2011 22:54:18 -0000	1.57
@@ -495,6 +495,7 @@
 	keepaliveMaxRequest: 10
 	sslKeyFilePath: /usr/local/etc/sfcb/file.pem
 	sslCertificateFilePath: /usr/local/etc/sfcb/server.pem
+    sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
 	registrationDir: /usr/local/var/lib/sfcb/registration
 	providerDirs: /usr/local/lib/sfcb /usr/local/lib /usr/local/lib/cmpi
 
@@ -562,8 +563,6 @@
 slpRefreshInterval
 	timeinterval in seconds in which the slp process refreshes information
 
-
-
 keepaliveTimeout
         Specify the maximum time in seconds an sfcb HTTP process will wait
         between two requests on one connection before terminating. Setting 
@@ -584,6 +583,11 @@
 	The file must be in PEM format. This file is only required if 
 	enableHttps is set to true. Default=/usr/local/etc/sfcb/server.pem
 
+sslCiphers
+	Specify the list of SSL ciphers to enable. 
+	Default is "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" which disables 
+		weak ciphers.
+
 registrationDir
 	Specify the registration directory, which contains the provider
 	registration data, the staging area and the static repository.

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.608
retrieving revision 1.609
diff -u -d -r1.608 -r1.609
--- NEWS	9 Sep 2011 21:32:43 -0000	1.608
+++ NEWS	9 Sep 2011 22:54:18 -0000	1.609
@@ -4,6 +4,7 @@
 New features:
 
 - 3406823 Make select timeout a config option.
+- 3406825 Make ssl cipher list configurable
 
 Bugs fixed: 
 

Index: control.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/control.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- control.c	9 Sep 2011 21:32:43 -0000	1.39
+++ control.c	9 Sep 2011 22:54:18 -0000	1.40
@@ -104,6 +104,7 @@
 
    {"sslKeyFilePath",   0, SFCB_CONFDIR "/file.pem"},
    {"sslCertificateFilePath", 0, SFCB_CONFDIR "/server.pem"},
+   {"sslCiphers", 0, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"},
 
    {"registrationDir", 0, SFCB_STATEDIR "/registration"},
    {"providerDirs", 3, SFCB_LIBDIR " " CMPI_LIBDIR " " LIBDIR}, /* 3: unstripped */

[Sblim-commit] sfcb ChangeLog, 1.683, 1.684 NEWS, 1.607, 1.608 README, 1.55, 1.56 control.c, 1.38, 1.39 httpAdapter.c, 1.91, 1.92 sfcb.cfg.pre.in, 1.25, 1.26

[Michael Chase-S. <mc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv20198

Modified Files:
	ChangeLog NEWS README control.c httpAdapter.c sfcb.cfg.pre.in 
Log Message:
[ 3406823 ] Make select timeout a config option.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -d -r1.683 -r1.684
--- ChangeLog	6 Sep 2011 23:35:56 -0000	1.683
+++ ChangeLog	9 Sep 2011 21:32:43 -0000	1.684
@@ -1,3 +1,8 @@
+2011-09-09 Michael Chase-Salerno <br...@li...>
+
+	* httpAdapter.c, sfcb.cfg.pre.in, control.c:
+	[ 3406823 ] Make select timeout a config option.
+
 2011-09-06 Michael Chase-Salerno <br...@li...>
 
 	* httpAdapter.c:

Index: sfcb.cfg.pre.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sfcb.cfg.pre.in	29 Apr 2011 21:40:50 -0000	1.25
+++ sfcb.cfg.pre.in	9 Sep 2011 21:32:43 -0000	1.26
@@ -58,6 +58,10 @@
 ## Default is: sfcBasicAuthentication
 basicAuthLib:   @SFCB_CONF_BASICAUTHLIB@
 
+## Maximum time in seconds an sfcb HTTP process will wait for select.
+## Default is 5
+#selectTimeout: 5
+
 ## Maximum time in seconds an sfcb HTTP process will wait between two requests
 ## on one connection before terminating. 0 will disable HTTP keep-alive.
 ## Default is 15

Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- httpAdapter.c	6 Sep 2011 23:35:56 -0000	1.91
+++ httpAdapter.c	9 Sep 2011 21:32:43 -0000	1.92
@@ -88,7 +88,8 @@
 static long keepaliveTimeout=15;
 static long keepaliveMaxRequest=10;
 static long numRequest;
-struct timeval httpSelectTimeout = {5, 0};  /* 5 sec. timeout for select() before read() */
+static long     selectTimeout = 5; /* default 5 sec. timeout for select() before read() */
+struct timeval httpSelectTimeout = {0, 0};
 
 #if defined USE_SSL
 static SSL_CTX *ctx;
@@ -1566,6 +1567,11 @@
     doUdsAuth = 0;
 #endif
 
+  // Get selectTimeout from the config file, or use 5 if not set
+  if (getControlNum("selectTimeout", &selectTimeout))
+    selectTimeout = 5;
+  httpSelectTimeout.tv_sec=selectTimeout;
+
   if (getControlNum("keepaliveTimeout", &keepaliveTimeout))
     keepaliveTimeout = 15;
 
@@ -1633,6 +1639,8 @@
           "--- Using Unix Socket Peer Cred Authentication\n");
 #endif
 
+  mlogf(M_INFO, M_SHOW, "--- Select timeout: %ld seconds\n",selectTimeout);
+
   if (keepaliveTimeout == 0) {
     mlogf(M_INFO, M_SHOW, "--- Keep-alive timeout disabled\n");
   } else {

Index: README
===================================================================
RCS file: /cvsroot/sblim/sfcb/README,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- README	8 Nov 2010 23:43:14 -0000	1.55
+++ README	9 Sep 2011 21:32:43 -0000	1.56
@@ -490,6 +490,7 @@
 	doBasicAuth:    false
 	basicAuthLib:   sfcBasicAuthentication
 	useChunking:    true
+    selectTimeout:  5
 	keepaliveTimeout: 0
 	keepaliveMaxRequest: 10
 	sslKeyFilePath: /usr/local/etc/sfcb/file.pem
@@ -554,9 +555,15 @@
         sfcb should/not advertise wbem services with the DA
         Default=true
 
+selectTimeout
+	Specify the maximum time in seconds for the HTTP select to complete.
+	Default is 5 seconds.
+
 slpRefreshInterval
 	timeinterval in seconds in which the slp process refreshes information
 
+
+
 keepaliveTimeout
         Specify the maximum time in seconds an sfcb HTTP process will wait
         between two requests on one connection before terminating. Setting 

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.607
retrieving revision 1.608
diff -u -d -r1.607 -r1.608
--- NEWS	6 Sep 2011 23:35:56 -0000	1.607
+++ NEWS	9 Sep 2011 21:32:43 -0000	1.608
@@ -1,6 +1,10 @@
 Changes in 1.3.13
 =================
 
+New features:
+
+- 3406823 Make select timeout a config option.
+
 Bugs fixed: 
 
 - 3386391 HOST_NAME_MAX undefined

Index: control.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/control.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- control.c	21 Jun 2011 16:07:32 -0000	1.38
+++ control.c	9 Sep 2011 21:32:43 -0000	1.39
@@ -94,6 +94,7 @@
    
    {"keepaliveTimeout",        1, "15"},
    {"keepaliveMaxRequest",     1, "10"},
+   {"selectTimeout",           1, "5"},
 
    {"providerSampleInterval",  1, "30"},
    {"providerTimeoutInterval", 1, "60"},

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-139-gb5bfde1

[Michael Chase-S. <mc...@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  b5bfde178bb0fb8db2f6aa77a8853b5536210d90 (commit)
      from  68195d80e4569c61195c39df7708ec95db43cf69 (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 b5bfde178bb0fb8db2f6aa77a8853b5536210d90
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Sep 9 13:27:50 2011 -0400

    [ 3400114 ] sfcb fails to start with ipv6 disabled

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

Summary of changes:
diff --git a/contributions.txt b/contributions.txt
index 1209019..1ba8a38 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -113,6 +113,7 @@ Klaus Kampf, Novell
 05/27/2010 [ 2984485 ] Possible access to freed memory in cimslpSLP.c
 06/30/2010 [ 2968599 ] Wrong trace msg for invokeMethod (local interface)
 06/09/2011 [ 3047562 ] [patch] Create bzip2 tarballs on "make dist"
+09/06/2011 [ 3400114 ] sfcb fails to start with ipv6 disabled
 
 Mike Brasher, Inova
 -------------------


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

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-138-g68195d8

[Michael Chase-S. <mc...@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  68195d80e4569c61195c39df7708ec95db43cf69 (commit)
       via  d1ac95d90cb0a0a76b2ec6261156bc81c27f8fc5 (commit)
       via  161efa73f5276a56a6fab090732a7459dbd2223f (commit)
      from  9eae8745aae577ffd227553516f2282d578f7075 (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 68195d80e4569c61195c39df7708ec95db43cf69
Merge: d1ac95d 9eae874
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Sep 9 13:25:46 2011 -0400

    Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb
    
    Conflicts:
    	ChangeLog

commit d1ac95d90cb0a0a76b2ec6261156bc81c27f8fc5
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Sep 9 13:23:20 2011 -0400

    3406825 Make ssl cipher list configurable

commit 161efa73f5276a56a6fab090732a7459dbd2223f
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Sep 9 13:22:03 2011 -0400

    3406825 Make ssl cipher list configurable

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 47fdedd..abaa502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2011-09-09 Michael Chase-Salerno <br...@li...>
+
+	* httpAdapter.c, sfcb.cfg.pre.in, control.c:
+	[ 3406825 ] Make ssl cipher list configurable
+
 2011-09-09 Narasimha Sharoff <nsh...@us...>
 
 	* mofc/backend_sfcb.c objectImplSwapI32toP32.c
 	[ 3310192 ] 32bit sfcbmof fails to run under x86_64
 	Initial patch from Chris Poblete, reworked by Narasimha Sharoff
 
-2011-09-06 Michael Chase-Salerno <br...@li...>
+2011-09-09 Michael Chase-Salerno <br...@li...>
 
 	* httpAdapter.c, sfcb.cfg.pre.in, control.c:
 	[ 3406823 ] Make select timeout a config option.
diff --git a/README b/README
index 92b5689..240c7d4 100644
--- a/README
+++ b/README
@@ -510,6 +510,7 @@ file /usr/local/etc/sfcb/sfcb.cfg. For example:
 	keepaliveMaxRequest: 10
 	sslKeyFilePath: /usr/local/etc/sfcb/file.pem
 	sslCertificateFilePath: /usr/local/etc/sfcb/server.pem
+    sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
 	registrationDir: /usr/local/var/lib/sfcb/registration
 	providerDirs: /usr/local/lib/sfcb /usr/local/lib /usr/local/lib/cmpi
 
@@ -602,6 +603,11 @@ sslCertificateFilePath
 	The file must be in PEM format. This file is only required if 
 	enableHttps is set to true. Default=/usr/local/etc/sfcb/server.pem
 
+sslCiphers
+	Specify the list of SSL ciphers to enable. 
+	Default is "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" which disables 
+		weak ciphers.
+
 registrationDir
 	Specify the registration directory, which contains the provider
 	registration data, the staging area and the static repository.
diff --git a/control.c b/control.c
index 225e015..11f1567 100644
--- a/control.c
+++ b/control.c
@@ -95,6 +95,7 @@ Control         init[] = {
   {"sslKeyFilePath", 0, SFCB_CONFDIR "/file.pem"},
   {"sslCertificateFilePath", 0, SFCB_CONFDIR "/server.pem"},
   {"sslCertList", 0, SFCB_CONFDIR "/clist.pem"},
+  {"sslCiphers", 0, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"},
 
   {"registrationDir", 0, SFCB_STATEDIR "/registration"},
   {"providerDirs", 3, SFCB_LIBDIR " " CMPI_LIBDIR " " LIBDIR},  /* 3:
diff --git a/httpAdapter.c b/httpAdapter.c
index d4767bc..67bcb5c 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -1599,7 +1599,8 @@ initSSL()
                  *fnk,
                  *fnt,
                  *fnl,
-                 *fcert;
+                 *fcert,
+                 *sslCiphers;
   int             rc;
   ctx = SSL_CTX_new(SSLv23_method());
   getControlChars("sslCertificateFilePath", &fnc);
@@ -1647,10 +1648,11 @@ initSSL()
   SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 |
                       SSL_OP_SINGLE_DH_USE);
   /*
-   * disable weak ciphers 
+   * Set valid ciphers
    */
-  if (SSL_CTX_set_cipher_list(ctx, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH")
-      != 1)
+  getControlChars("sslCiphers", &sslCiphers);
+  _SFCB_TRACE(1, ("---  sslCiphers = %s", sslCiphers));
+  if (SSL_CTX_set_cipher_list(ctx, sslCiphers) != 1)
     intSSLerror("Error setting cipher list (no valid ciphers)");
 
 }
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index 6cefc75..f22dbec 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -193,6 +193,11 @@ sslClientTrustStore: @sysconfdir@/sfcb/client.pem
 ## Default is sfcCertificateAuthentication
 certificateAuthLib:   sfcCertificateAuthentication
 
+## List of SSL ciphers to enable.
+## Default is "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" which disables
+##      weak ciphers.
+sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
+
 ##---------------------------------- UDS --------------------------------------
 ## These options only apply if configured with --enable-uds
 


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

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-135-g9eae874

[Narasimha S. <nsh...@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  9eae8745aae577ffd227553516f2282d578f7075 (commit)
      from  09035e501fb18f007e841e82017d30ce97408e96 (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 9eae8745aae577ffd227553516f2282d578f7075
Author: Narasimha Sharoff <nsh...@us...>
Date:   Fri Sep 9 09:36:53 2011 -0700

    [3310192] 32bit sfcbmof fails to run under x86_64

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 7a20d98..47fdedd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-09 Narasimha Sharoff <nsh...@us...>
+
+	* mofc/backend_sfcb.c objectImplSwapI32toP32.c
+	[ 3310192 ] 32bit sfcbmof fails to run under x86_64
+	Initial patch from Chris Poblete, reworked by Narasimha Sharoff
+
 2011-09-06 Michael Chase-Salerno <br...@li...>
 
 	* httpAdapter.c, sfcb.cfg.pre.in, control.c:
diff --git a/NEWS b/NEWS
index 3e33140..6ff0072 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Bugs fixed:
 - 3300167 Memory leaks caused by cimRequest changes
 - 3101157 Failed to enable provider timing analysis with SfcbLocal
 - 3400114 sfcb fails to start with ipv6 disabled
+- 3310192 32bit sfcbmof fails to run x86_64
 
 Changes in 1.4.1
 ================
diff --git a/objectImplSwapI32toP32.c b/objectImplSwapI32toP32.c
index 63d3a39..37168db 100644
--- a/objectImplSwapI32toP32.c
+++ b/objectImplSwapI32toP32.c
@@ -506,20 +506,14 @@ swapI32toP32Class(ClClass * cls, int *size)
   ClObjectHdr    *hdr = &cls->hdr;
   int             ofs = sizeof(CLP32_ClClass);
   int             sz = p32SizeClassH(hdr, cls) + CLEXTRA;
-  struct utsname  uName;
-  static int      first = 1;
   // char *cn;
 
-  if (first) {
-    uname(&uName);
-
-    if (uName.machine[0] != 'i' || strcmp(uName.machine + 2, "86") != 0) {
+#if (__WORDSIZE !=32) || !defined (__i386__) || (__x86_64__ )
       fprintf(stderr,
-              "--- swapI32toP32Class can only execute on ix86 machines\n");
+              "--- swapI32toP32Class can only execute on ix86 built 32bit binary\n");
       exit(16);
-    }
-    first = 0;
-  }
+#endif // __i386__ 
+
   // cn=(char*)ClObjectGetClString(&cls->hdr, &cls->name);
 
   CLP32_ClClass  *nc = (CLP32_ClClass *) calloc(1, sz);
@@ -557,19 +551,11 @@ swapI32toP32Instance(ClInstance * inst, int *size)
   ClObjectHdr    *hdr = &inst->hdr;
   int             ofs = sizeof(CLP32_ClInstance);
   int             sz = p32SizeInstanceH(hdr, inst) + CLEXTRA;
-  struct utsname  uName;
-  static int      first = 1;
-
-  if (first) {
-    uname(&uName);
 
-    if (uName.machine[0] != 'i' || strcmp(uName.machine + 2, "86") != 0) {
+#if (__WORDSIZE != 32) && !defined (__i386__) || (__x86_64__)
       fprintf(stderr,
-              "--- swapI32toP32Instance can only execute on ix86 machines\n");
-      exit(16);
-    }
-    first = 0;
-  }
+              "--- swapI32toP32Instance can only execute on ix86 built 32bit binary\n");
+#endif // __i386__
 
   CLP32_ClInstance *ni = (CLP32_ClInstance *) calloc(1, sz);
 
@@ -603,19 +589,13 @@ swapI32toP32QualifierDeclaration(ClQualifierDeclaration * qual, int *size)
   ClObjectHdr    *hdr = &qual->hdr;
   int             ofs = sizeof(CLP32_ClQualifierDeclaration);
   int             sz = p32SizeQualifierH(hdr, qual) + CLEXTRA;
-  struct utsname  uName;
-  static int      first = 1;
 
-  if (first) {
-    uname(&uName);
 
-    if (uName.machine[0] != 'i' || strcmp(uName.machine + 2, "86") != 0) {
+#if (__WORDSIZE !=32) || !defined (__i386__) || (__x86_64__ )
       fprintf(stderr,
               "--- swapI32toP32QualifierDeclaration can only execute on ix86 machines\n");
       exit(16);
-    }
-    first = 0;
-  }
+#endif // __i386 __
 
   CLP32_ClQualifierDeclaration *nq =
       (CLP32_ClQualifierDeclaration *) calloc(1, sz);


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

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-134-g09035e5

[Michael Chase-S. <mc...@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  09035e501fb18f007e841e82017d30ce97408e96 (commit)
       via  c90a6b5b1d4edac091c7e79e6af8b7d969546428 (commit)
      from  6d2b8dd1f7a0c4856feac9593cae24b491dd73da (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 09035e501fb18f007e841e82017d30ce97408e96
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Sep 9 11:42:14 2011 -0400

    3406823 Make select timeout a config option.

commit c90a6b5b1d4edac091c7e79e6af8b7d969546428
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Sep 9 11:40:23 2011 -0400

    3406823 Make select timeout a config option.

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 033aff1..7a20d98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-09-06 Michael Chase-Salerno <br...@li...>
 
+	* httpAdapter.c, sfcb.cfg.pre.in, control.c:
+	[ 3406823 ] Make select timeout a config option.
+
+2011-09-06 Michael Chase-Salerno <br...@li...>
+
 	* httpAdapter.c:
 	[ 3400114 ] sfcb fails to start with ipv6 disabled
 	Patch from kkaempf
diff --git a/README b/README
index a98707b..92b5689 100644
--- a/README
+++ b/README
@@ -505,6 +505,7 @@ file /usr/local/etc/sfcb/sfcb.cfg. For example:
 	doBasicAuth:    false
 	basicAuthLib:   sfcBasicAuthentication
 	useChunking:    true
+	selectTimeout:  5
 	keepaliveTimeout: 0
 	keepaliveMaxRequest: 10
 	sslKeyFilePath: /usr/local/etc/sfcb/file.pem
@@ -577,6 +578,10 @@ enableSlp
 slpRefreshInterval
 	timeinterval in seconds in which the slp process refreshes information
 
+selectTimeout
+    Specify the maximum time in seconds for the HTTP select to complete.
+    Default is 5 seconds.
+
 keepaliveTimeout
         Specify the maximum time in seconds an sfcb HTTP process will wait
         between two requests on one connection before terminating. Setting 
diff --git a/control.c b/control.c
index e31d3fb..225e015 100644
--- a/control.c
+++ b/control.c
@@ -84,6 +84,7 @@ Control         init[] = {
 
   {"keepaliveTimeout", 1, "15"},
   {"keepaliveMaxRequest", 1, "10"},
+  {"selectTimeout", 1, "5"},
 
   {"providerSampleInterval", 1, "30"},
   {"providerTimeoutInterval", 1, "60"},
diff --git a/httpAdapter.c b/httpAdapter.c
index b308c7f..d4767bc 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -93,8 +93,8 @@ static int      running = 0;
 static long     keepaliveTimeout = 15;
 static long     keepaliveMaxRequest = 10;
 static long     numRequest;
-struct timeval  httpSelectTimeout = { 5, 0 };   /* 5 sec. timeout for
-                                                 * select() before read() */
+static long     selectTimeout = 5; /* default 5 sec. timeout for select() before read() */
+struct timeval  httpSelectTimeout = { 0, 0 };   
 
 #if defined USE_SSL
 static SSL_CTX *ctx;
@@ -1750,6 +1750,11 @@ httpDaemon(int argc, char *argv[], int sslMode)
     doUdsAuth = 0;
 #endif
 
+  // Get selectTimeout from the config file, or use 5 if not set
+  if (getControlNum("selectTimeout", &selectTimeout))
+    selectTimeout = 5;
+  httpSelectTimeout.tv_sec=selectTimeout;
+  
   if (getControlNum("keepaliveTimeout", &keepaliveTimeout))
     keepaliveTimeout = 15;
 
@@ -1817,6 +1822,9 @@ httpDaemon(int argc, char *argv[], int sslMode)
           "--- Using Unix Socket Peer Cred Authentication\n");
 #endif
 
+
+  mlogf(M_INFO, M_SHOW, "--- Select timeout: %ld seconds\n",
+     selectTimeout);
   if (keepaliveTimeout == 0) {
     mlogf(M_INFO, M_SHOW, "--- Keep-alive timeout disabled\n");
   } else {
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index fe3c8e2..6cefc75 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -64,6 +64,10 @@ doBasicAuth:    false
 ## Default is: sfcBasicAuthentication
 basicAuthLib:   @SFCB_CONF_BASICAUTHLIB@
 
+## Maximum time in seconds an sfcb HTTP process will wait for select.
+## Default is 5
+#selectTimeout: 5
+
 ## Maximum time in seconds an sfcb HTTP process will wait between two requests
 ## on one connection before terminating. 0 will disable HTTP keep-alive.
 ## Default is 15


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

[Sblim-commit] jsr48-client NEWS,1.236,1.237

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

Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv3164

Modified Files:
	NEWS 
Log Message:
3406275 - HEAD branch ONLY: sync with Experimental branch

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- NEWS	8 Sep 2011 13:03:53 -0000	1.236
+++ NEWS	8 Sep 2011 14:47:24 -0000	1.237
@@ -7,6 +7,7 @@
 3390724 Problem with Reliable Indication support in the Listener
 3397922 support OctetString
 3400209 Highlighted Static Analysis (PMD) issues
+3406275 HEAD branch ONLY: sync with Experimental branch
 
 Version 2.1.9
 ================

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/uri Authority.java, 1.12, 1.13

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/uri
In directory vz-cvs-3.sog:/tmp/cvs-serv1882/src/org/sblim/cimclient/internal/uri

Modified Files:
	Authority.java 
Log Message:
3406275 	- HEAD branch ONLY: sync with Experimental branch

Index: Authority.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/uri/Authority.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Authority.java	10 Aug 2011 12:14:17 -0000	1.12
+++ Authority.java	8 Sep 2011 14:42:15 -0000	1.13
@@ -40,7 +40,7 @@
  * IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet<br>
  * reg-name    = *( unreserved / pct-encoded / sub-delims )<br><br>
  * 
- * IPv6address =   (                        6( h16 ":" ) ls32<br>
+ * IPv6address =   (                           6( h16 ":" ) ls32<br>
  *                /                       "::" 5( h16 ":" ) ls32<br>
  *                / [               h16 ] "::" 4( h16 ":" ) ls32<br>
  *                / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32<br>

[Sblim-commit] jsr48-client sblim-cim-client2.properties, 1.1.2.23, 1.1.2.24

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

Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv1867

Modified Files:
      Tag: Experimental
	sblim-cim-client2.properties 
Log Message:
3406274 	- Experimental branch ONLY: sync with HEAD branch

Index: sblim-cim-client2.properties
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.properties,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -d -r1.1.2.23 -r1.1.2.24
--- sblim-cim-client2.properties	20 May 2011 14:03:04 -0000	1.1.2.23
+++ sblim-cim-client2.properties	8 Sep 2011 14:41:46 -0000	1.1.2.24
@@ -267,14 +267,14 @@
 
 # Specifies the stream to use for tracing CIM-XML communication in the event
 # the application does not set one via the LogAndTraceManager class.  This
-# stream can either be standard output (System.out), standard error output 
+# stream can either be standard output (System.out), standard error output
 # (System.err) or a filename to be opened by the client.
 #
-# Note: This property has no effect unless sblim.wbem.cimxmlTracing is set to 
+# Note: This property has no effect unless sblim.wbem.cimxmlTracing is set to
 # true.
 #
 # Note: This property has no effect if the application already set the stream
-# prior to client initialization.  If the application sets the stream after 
+# prior to client initialization.  If the application sets the stream after
 # client initialization, the stream specified by this property is overridden.
 #
 # Note: If a filename is specified, it is opened and all CIM-XML communication

[Sblim-commit] jsr48-client/src/org/sblim/cimclient WBEMListenerSBLIM.java, 1.13, 1.14

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient
In directory vz-cvs-3.sog:/tmp/cvs-serv24251/src/org/sblim/cimclient

Modified Files:
	WBEMListenerSBLIM.java 
Log Message:
3400209 - Highlighted Static Analysis (PMD) issues

Index: WBEMListenerSBLIM.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMListenerSBLIM.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- WBEMListenerSBLIM.java	29 Jul 2010 18:51:56 -0000	1.13
+++ WBEMListenerSBLIM.java	8 Sep 2011 13:03:53 -0000	1.14
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2011
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -20,6 +20,7 @@
  * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
  * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
  * 3023348    2010-07-02  blaschke-oss Listener uses # constructor instead of valueOf
+ * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
  */
 
 package org.sblim.cimclient;
@@ -90,8 +91,9 @@
 		}
 
 		@Override
-		protected void finalize() {
+		protected void finalize() throws Throwable {
 			stop();
+			super.finalize();
 		}
 
 		/**