cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r641948 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
Date Thu, 27 Mar 2008 19:03:53 GMT
Author: dkulp
Date: Thu Mar 27 12:03:52 2008
New Revision: 641948

URL: http://svn.apache.org/viewvc?rev=641948&view=rev
Log:
Merged revisions 641689 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r641689 | dkulp | 2008-03-26 22:17:54 -0400 (Wed, 26 Mar 2008) | 2 lines
  
  Fix tab characters
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java?rev=641948&r1=641947&r2=641948&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
Thu Mar 27 12:03:52 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/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?rev=641948&r1=641947&r2=641948&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
Thu Mar 27 12:03:52 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));
         }
         



Mime
View raw message