[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/wbem/indications CIMIndicationHandler.java, 1.31, 1.32

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

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

Modified Files:
	CIMIndicationHandler.java 
Log Message:
3554738 - dump CIM xml by LogAndTraceBroker.trace()

Index: CIMIndicationHandler.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- CIMIndicationHandler.java	17 Aug 2012 02:47:40 -0000	1.31
+++ CIMIndicationHandler.java	6 Sep 2012 14:46:48 -0000	1.32
@@ -42,13 +42,16 @@
  * 3492214    2012-02-23  blaschke-oss Add a SenderIPAddress property indications
  * 3513228    2012-04-23  blaschke-oss Reliable Indications support can create lots of threads
  * 3553858    2012-08-06  blaschke-oss Append duplicate HTTP header fields instead of replace
+ * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
  */
 
 package org.sblim.cimclient.internal.wbem.indications;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -495,8 +498,9 @@
 		}
 
 		InputStream inputstream = null;
-		if (this.iSessionProperties.isCimXmlTracingEnabled()
-				&& LogAndTraceBroker.getBroker().getXmlTraceStream() != null) {
+		if ((this.iSessionProperties.isCimXmlTracingEnabled() && LogAndTraceBroker.getBroker()
+				.getXmlTraceStream() != null)
+				|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
 			inputstream = new DebugInputStream(pReader.getInputStream(), LogAndTraceBroker
 					.getBroker().getXmlTraceStream());
 		} else {
@@ -753,8 +757,16 @@
 			// TODO: check this error code, may not be appropriate
 			throw new HttpException(400, "Bad Request");
 		}
-		if (this.iSessionProperties.isCimXmlTracingEnabled()) CIMClientXML_HelperImpl.dumpDocument(
-				LogAndTraceBroker.getBroker().getXmlTraceStream(), responseDoc); // debug
+		if (this.iSessionProperties.isCimXmlTracingEnabled()
+				|| this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) {
+			OutputStream pos = new ByteArrayOutputStream();
+			CIMClientXML_HelperImpl.dumpDocument(pos, responseDoc);
+			OutputStream debugStream = this.iLogger.getXmlTraceStream();
+			if (this.iSessionProperties.isCimXmlTracingEnabled() && debugStream != null) debugStream
+					.write(pos.toString().getBytes());
+			if (this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) this.iLogger.traceCIMXML(
+					Level.FINEST, pos.toString(), true);
+		}
 		CIMClientXML_HelperImpl.serialize(pWriter.getOutputStream(), responseDoc);
 		pWriter.getHeader().addField("CIMExport", "MethodResponse");
 	}