[jboss-svn-commits] JBoss Common SVN: r3352 - jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-07-09 00:00:19 -0400 (Thu, 09 Jul 2009)
New Revision: 3352

Added:
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/UncloseableOutputStream.java
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/UncloseableWriter.java
Modified:
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/ConsoleHandler.java
Log:
The console handler should never close system streams

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/ConsoleHandler.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/ConsoleHandler.java	2009-07-09 03:54:28 UTC (rev 3351)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/ConsoleHandler.java	2009-07-09 04:00:19 UTC (rev 3352)
@@ -103,4 +103,13 @@
     public void setTarget(Target target) {
         setOutputStream(targets.get(target));
     }
+
+    /** {@inheritDoc} */
+    public void setOutputStream(final OutputStream outputStream) {
+        if (outputStream instanceof UncloseableOutputStream) {
+            super.setOutputStream(outputStream);
+        } else {
+            super.setOutputStream(new UncloseableOutputStream(outputStream));
+        }
+    }
 }

Added: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/UncloseableOutputStream.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/UncloseableOutputStream.java	                        (rev 0)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/UncloseableOutputStream.java	2009-07-09 04:00:19 UTC (rev 3352)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.logmanager.handlers;
+
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * An output stream wrapper which drops calls to the {@code close()} method.
+ */
+public final class UncloseableOutputStream extends OutputStream {
+    private final OutputStream delegate;
+
+    public UncloseableOutputStream(final OutputStream delegate) {
+        this.delegate = delegate;
+    }
+
+    public void write(final int b) throws IOException {
+        delegate.write(b);
+    }
+
+    public void write(final byte[] b) throws IOException {
+        delegate.write(b);
+    }
+
+    public void write(final byte[] b, final int off, final int len) throws IOException {
+        delegate.write(b, off, len);
+    }
+
+    public void flush() throws IOException {
+        delegate.flush();
+    }
+
+    public void close() {
+        // ignore
+    }
+}

Added: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/UncloseableWriter.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/UncloseableWriter.java	                        (rev 0)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/UncloseableWriter.java	2009-07-09 04:00:19 UTC (rev 3352)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.logmanager.handlers;
+
+import java.io.Writer;
+import java.io.IOException;
+
+/**
+ * An output stream wrapper which drops calls to the {@code close()} method.
+ */
+public final class UncloseableWriter extends Writer {
+    private final Writer delegate;
+
+    public UncloseableWriter(final Writer delegate) {
+        this.delegate = delegate;
+    }
+
+    public void write(final int c) throws IOException {
+        delegate.write(c);
+    }
+
+    public void write(final char[] cbuf) throws IOException {
+        delegate.write(cbuf);
+    }
+
+    public void write(final char[] cbuf, final int off, final int len) throws IOException {
+        delegate.write(cbuf, off, len);
+    }
+
+    public void write(final String str) throws IOException {
+        delegate.write(str);
+    }
+
+    public void write(final String str, final int off, final int len) throws IOException {
+        delegate.write(str, off, len);
+    }
+
+    public Writer append(final CharSequence csq) throws IOException {
+        return delegate.append(csq);
+    }
+
+    public Writer append(final CharSequence csq, final int start, final int end) throws IOException {
+        return delegate.append(csq, start, end);
+    }
+
+    public Writer append(final char c) throws IOException {
+        return delegate.append(c);
+    }
+
+    public void flush() throws IOException {
+        delegate.flush();
+    }
+
+    public void close() {
+        // ignore
+    }
+}
\ No newline at end of file