Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging
In directory vz-cvs-3.sog:/tmp/cvs-serv5135/src/org/sblim/cimclient/internal/logging
Modified Files:
Tag: Experimental
LogAndTraceBroker.java
Log Message:
3252669 - setXmlTraceStream blindly closes previous stream
Index: LogAndTraceBroker.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging/LogAndTraceBroker.java,v
retrieving revision 1.10.2.10
retrieving revision 1.10.2.11
diff -u -d -r1.10.2.10 -r1.10.2.11
--- LogAndTraceBroker.java 13 Jan 2011 16:15:43 -0000 1.10.2.10
+++ LogAndTraceBroker.java 28 Mar 2011 13:59:59 -0000 1.10.2.11
@@ -23,6 +23,7 @@
* 3001345 2010-05-18 blaschke-oss File handle leaks in HttpSocketFactory and LogAndTraceBroker
* 3027618 2010-07-14 blaschke-oss Close files/readers in finally blocks
* 3154232 2011-01-13 blaschke-oss EmbeddedObject misspelled in javadoc
+ * 3252669 2011-03-28 blaschke-oss setXmlTraceStream blindly closes previous stream
*/
package org.sblim.cimclient.internal.logging;
@@ -561,7 +562,8 @@
* CIM-XML debugging is disabled.
*/
public void setXmlTraceStream(OutputStream pStream) {
- if (this.iXmlTraceStream != null) {
+ if ((this.iXmlTraceStream != null) && (!this.iXmlTraceStream.equals(System.out))
+ && (!this.iXmlTraceStream.equals(System.err))) {
try {
this.iXmlTraceStream.close();
} catch (IOException e) {
|