sblim-commit

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

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

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

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.67.2.1
retrieving revision 1.67.2.2
diff -u -d -r1.67.2.1 -r1.67.2.2
--- WBEMClientCIMXML.java	6 Sep 2012 11:23:13 -0000	1.67.2.1
+++ WBEMClientCIMXML.java	6 Sep 2012 19:57:14 -0000	1.67.2.2
@@ -58,9 +58,11 @@
  * 3423064    2011-10-13  blaschke-oss Add UpdateExpiredPassword Header for Reqs from Java Client
  * 3496355    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
  * 3545797    2012-09-06  blaschke-oss Support new error code of SFCB
+ * 3554738    2012-09-06  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
  */
 package org.sblim.cimclient.internal.wbem;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -126,6 +128,7 @@
 import org.sblim.cimclient.internal.http.io.TrailerException;
 import org.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.sblim.cimclient.internal.logging.Messages;
+import org.sblim.cimclient.internal.logging.TimeStamp;
 import org.sblim.cimclient.internal.util.MOF;
 import org.sblim.cimclient.internal.util.WBEMConfiguration;
 import org.sblim.cimclient.internal.util.WBEMConfigurationDefaults;
@@ -1770,8 +1773,16 @@
 
 			OutputStream os = connection.getOutputStream();
 
-			if (this.iConfiguration.isCimXmlTracingEnabled()) CIMClientXML_HelperImpl.dumpDocument(
-					LogAndTraceBroker.getBroker().getXmlTraceStream(), pDocument); // debug
+			if (this.iConfiguration.isCimXmlTracingEnabled()
+					|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+				OutputStream pos = new ByteArrayOutputStream();
+				CIMClientXML_HelperImpl.dumpDocument(pos, pDocument);
+				OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
+				if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
+						.write(pos.toString().getBytes());
+				if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
+						.traceCIMXML(Level.FINEST, pos.toString(), true);
+			}
 			CIMClientXML_HelperImpl.serialize(os, pDocument);
 			os.flush();
 			os.close();
@@ -1818,7 +1829,8 @@
 
 					InputStream is = connection.getInputStream();
 					OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
-					if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) {
+					if ((this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null)
+							|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
 						is = new DebugInputStream(is, debugStream);
 					}
 
@@ -1891,12 +1903,19 @@
 			// sending multiple requests without any response)
 			if (retries > 0) {
 				OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
-				if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) {
-					String resultStr = "HTTP " + resultCode + " " + connection.getResponseMessage()
-							+ " (retrying request)\n";
-					debugStream.write("<--- error response begin ----\n".getBytes());
-					debugStream.write(resultStr.toString().getBytes());
-					debugStream.write("\n---- error response end ----->\n".getBytes());
+				if ((this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null)
+						|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+					StringBuilder resultStr = new StringBuilder("<--- error response begin ");
+					resultStr.append(TimeStamp.formatWithMillis(System.currentTimeMillis()));
+					resultStr.append(" ----\nHTTP ");
+					resultStr.append(resultCode);
+					resultStr.append(' ');
+					resultStr.append(connection.getResponseMessage());
+					resultStr.append(" (retrying request)\n---- error response end ----->\n");
+					if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
+							.write(resultStr.toString().getBytes());
+					if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
+							.traceCIMXML(Level.FINEST, resultStr.toString(), false);
 				}
 			}
 		} while (retries-- > 0);