Browse Source
The underlying problem is that System.out is a PrintWriter and as such it does not throw exceptions on error, but rather just sets a flag and continues. This changes replaces the use of System.out with a PrintWriter-like writer that does not catch error, but instead throw them to the caller. Bug: 366243 Change-Id: I44405edc4416e943b87f09a0f6ed041c6c51b046stable-2.2
Robin Rosenberg
12 years ago
committed by
Shawn O. Pearce
42 changed files with 439 additions and 228 deletions
@ -0,0 +1,171 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2012, Robin Rosenberg <robin.rosenberg@dewire.com> |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
package org.eclipse.jgit.util.io; |
||||||
|
|
||||||
|
import java.io.IOException; |
||||||
|
import java.io.Writer; |
||||||
|
import java.security.AccessController; |
||||||
|
import java.security.PrivilegedAction; |
||||||
|
|
||||||
|
import org.eclipse.jgit.util.SystemReader; |
||||||
|
|
||||||
|
/** |
||||||
|
* An alternative PrintWriter that doesn't catch exceptions. |
||||||
|
*/ |
||||||
|
public class ThrowingPrintWriter extends Writer { |
||||||
|
|
||||||
|
private final Writer out; |
||||||
|
|
||||||
|
private final String LF; |
||||||
|
|
||||||
|
/** |
||||||
|
* Construct a JGitPrintWriter |
||||||
|
* |
||||||
|
* @param out |
||||||
|
* the underlying {@link Writer} |
||||||
|
*/ |
||||||
|
public ThrowingPrintWriter(Writer out) { |
||||||
|
this.out = out; |
||||||
|
LF = AccessController.doPrivileged(new PrivilegedAction<String>() { |
||||||
|
public String run() { |
||||||
|
return SystemReader.getInstance().getProperty("line.separator"); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void write(char[] cbuf, int off, int len) throws IOException { |
||||||
|
out.write(cbuf, off, len); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void flush() throws IOException { |
||||||
|
out.flush(); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void close() throws IOException { |
||||||
|
out.close(); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Print a string and terminate with a line feed. |
||||||
|
* |
||||||
|
* @param s |
||||||
|
* @throws IOException |
||||||
|
*/ |
||||||
|
public void println(String s) throws IOException { |
||||||
|
print(s + LF); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Print a platform dependent new line |
||||||
|
* |
||||||
|
* @throws IOException |
||||||
|
*/ |
||||||
|
public void println() throws IOException { |
||||||
|
print(LF); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Print a char |
||||||
|
* |
||||||
|
* @param value |
||||||
|
* @throws IOException |
||||||
|
*/ |
||||||
|
public void print(char value) throws IOException { |
||||||
|
print(String.valueOf(value)); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Print an int as string |
||||||
|
* |
||||||
|
* @param value |
||||||
|
* @throws IOException |
||||||
|
*/ |
||||||
|
public void print(int value) throws IOException { |
||||||
|
print(String.valueOf(value)); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Print a long as string |
||||||
|
* |
||||||
|
* @param value |
||||||
|
* @throws IOException |
||||||
|
*/ |
||||||
|
public void print(long value) throws IOException { |
||||||
|
print(String.valueOf(value)); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Print a short as string |
||||||
|
* |
||||||
|
* @param value |
||||||
|
* @throws IOException |
||||||
|
*/ |
||||||
|
public void print(short value) throws IOException { |
||||||
|
print(String.valueOf(value)); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Print a formatted message according to |
||||||
|
* {@link String#format(String, Object...)}. |
||||||
|
* |
||||||
|
* @param fmt |
||||||
|
* @param args |
||||||
|
* @throws IOException |
||||||
|
*/ |
||||||
|
public void format(String fmt, Object... args) throws IOException { |
||||||
|
print(String.format(fmt, args)); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Print an object's toString representations |
||||||
|
* |
||||||
|
* @param any |
||||||
|
* @throws IOException |
||||||
|
*/ |
||||||
|
public void print(Object any) throws IOException { |
||||||
|
out.write(String.valueOf(any)); |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue