[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/wbem WBEMClientCIMXML.java, 1.21.2.51, 1.21.2.52

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

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

Modified Files:
      Tag: Experimental
	WBEMClientCIMXML.java 
Log Message:
3277928 - CIM-XML tracing cannot be enabled in the field

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.51
retrieving revision 1.21.2.52
diff -u -d -r1.21.2.51 -r1.21.2.52
--- WBEMClientCIMXML.java	7 Mar 2011 12:36:22 -0000	1.21.2.51
+++ WBEMClientCIMXML.java	6 Apr 2011 22:44:27 -0000	1.21.2.52
@@ -54,10 +54,12 @@
  * 3028518    2010-07-14  blaschke-oss Additional StringBuilder use
  * 3185833    2011-02-18  blaschke-oss missing newline when logging request/response
  * 3197423    2011-03-02  blaschke-oss Server authentication with PegasusLocalAuthInfo failing
+ * 3277928    2011-04-07  blaschke-oss CIM-XML tracing cannot be enabled in the field
  */
 package org.sblim.cimclient.internal.wbem;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -142,6 +144,8 @@
 
 	private final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
 
+	private FileOutputStream iCimXmlTraceFile = null;
+
 	private Locale[] iLocales; // final
 
 	private HttpClientPool iHttpClientPool; // final
@@ -230,6 +234,27 @@
 				throw new RuntimeException(e);
 			}
 
+			if (this.iConfiguration.isCimXmlTracingEnabled()
+					&& LogAndTraceBroker.getBroker().getXmlTraceStream() == null) {
+				String filename = this.iConfiguration.getCimXmlTraceStream();
+				if (filename != null && filename.length() > 0) {
+					if (filename.equalsIgnoreCase("System.out")) {
+						LogAndTraceBroker.getBroker().setXmlTraceStream(System.out);
+					} else if (filename.equalsIgnoreCase("System.err")) {
+						LogAndTraceBroker.getBroker().setXmlTraceStream(System.err);
+					} else {
+						try {
+							this.iCimXmlTraceFile = new FileOutputStream(filename);
+							LogAndTraceBroker.getBroker().setXmlTraceStream(this.iCimXmlTraceFile);
+						} catch (IOException e) {
+							logger.trace(Level.FINE, "Unable to open "
+									+ WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "="
+									+ filename, e);
+						}
+					}
+				}
+			}
+
 			this.iInitialized = true;
 
 		} finally {
@@ -622,6 +647,11 @@
 			if (this.iHttpClientPool != null) {
 				this.iHttpClientPool.closePool();
 			}
+			if (this.iCimXmlTraceFile != null) {
+				this.iCimXmlTraceFile.close();
+			}
+		} catch (IOException e) {
+			// Ignore CIM-XML trace file exception
 		} finally {
 			this.iClosed = true;
 			logger.exit();