cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1174287 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
Date Thu, 22 Sep 2011 18:00:24 GMT
Author: dkulp
Date: Thu Sep 22 18:00:23 2011
New Revision: 1174287

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

........
  r1174182 | dkulp | 2011-09-22 11:01:43 -0400 (Thu, 22 Sep 2011) | 2 lines
  
  WSDL retrieval sometimes dumps stack traces if client does't read the
  full wsdl/schema.
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java

Propchange: cxf/branches/2.4.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java?rev=1174287&r1=1174286&r2=1174287&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
Thu Sep 22 18:00:23 2011
@@ -29,6 +29,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.wsdl.Definition;
@@ -124,8 +125,19 @@ public class WSDLGetInterceptor extends 
                                   ctx,
                                   message.getExchange().getEndpoint().getEndpointInfo(),
                                   os);
-                    os.close();
                     message.getInterceptorChain().abort();
+                    try {
+                        os.flush();
+                        os.close();
+                    } catch (IOException ex) {
+                        LOG.log(Level.FINE, "Failure writing full wsdl to the stream", ex);
+                        //we can ignore this.   Likely, whatever has requested the WSDL
+                        //has closed the connection before reading the entire wsdl.  
+                        //WSDL4J has a tendency to not read the closing tags and such
+                        //and thus can sometimes hit this.   In anycase, it's 
+                        //pretty much ignorable and nothing we can do about it (cannot
+                        //send a fault or anything anyway
+                    }
                 } catch (IOException e) {
                     throw new Fault(e);
                 } finally {



Mime
View raw message