Author: dkulp
Date: Wed Mar 26 19:17:54 2008
New Revision: 641689
URL: http://svn.apache.org/viewvc?rev=641689&view=rev
Log:
Fix tab characters
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java?rev=641689&r1=641688&r2=641689&view=diff
==============================================================================
---
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
(original)
+++
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
Wed Mar 26 19:17:54 2008
@@ -100,23 +100,23 @@
}
public static String toString(final InputStream input, int bufferSize)
- throws IOException {
-
+ throws IOException {
+
int avail = input.available();
if (avail > bufferSize) {
bufferSize = avail;
}
StringBuilder buf = new StringBuilder();
- final byte[] buffer = new byte[bufferSize];
- int n = 0;
- n = input.read(buffer);
- while (-1 != n) {
- buf.append(new String(buffer, 0, n));
- n = input.read(buffer);
- }
- input.close();
- return buf.toString();
+ final byte[] buffer = new byte[bufferSize];
+ int n = 0;
+ n = input.read(buffer);
+ while (-1 != n) {
+ buf.append(new String(buffer, 0, n));
+ n = input.read(buffer);
+ }
+ input.close();
+ return buf.toString();
}
public static String toString(final Reader input)
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?rev=641689&r1=641688&r2=641689&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
Wed Mar 26 19:17:54 2008
@@ -63,14 +63,14 @@
String contentType = (String)message.get(Message.CONTENT_TYPE);
if (contentType != null && contentType.contains("text/html")) {
- String htmlMessage = null;
- try {
- htmlMessage = IOUtils.toString(is, 500);
- } catch (IOException e) {
- throw new Fault(new
org.apache.cxf.common.i18n.Message("INVALID_HTML_RESPONSETYPE",
- LOG, "(none)"));
- }
- throw new Fault(new
org.apache.cxf.common.i18n.Message("INVALID_HTML_RESPONSETYPE",
+ String htmlMessage = null;
+ try {
+ htmlMessage = IOUtils.toString(is, 500);
+ } catch (IOException e) {
+ throw new Fault(new
org.apache.cxf.common.i18n.Message("INVALID_HTML_RESPONSETYPE",
+ LOG, "(none)"));
+ }
+ throw new Fault(new
org.apache.cxf.common.i18n.Message("INVALID_HTML_RESPONSETYPE",
LOG, (htmlMessage == null || htmlMessage.length() == 0) ?
"(none)" : htmlMessage));
}