svn commit: r685589 - /webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/DetachableInputStream.java

[sc...@apache.org]

Author: scheu
Date: Wed Aug 13 08:48:42 2008
New Revision: 685589

URL: http://svn.apache.org/viewvc?rev=685589&view=rev
Log:
WSCOMMONS-371
Changed DetachableInputStream to respect the close() setting.  
Added more debug trace.

Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/DetachableInputStream.java

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/DetachableInputStream.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/DetachableInputStream.java?rev=685589&r1=685588&r2=685589&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/DetachableInputStream.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/DetachableInputStream.java Wed Aug 13 08:48:42 2008
@@ -21,6 +21,8 @@
 import org.apache.axiom.attachments.impl.BufferUtils;
 import org.apache.axiom.attachments.utils.BAAInputStream;
 import org.apache.axiom.attachments.utils.BAAOutputStream;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -44,10 +46,12 @@
  */
 public class DetachableInputStream extends FilterInputStream {
 
+    private static Log log = LogFactory.getLog(DetachableInputStream.class);
     
 
     private long count = 0;
     BAAInputStream localStream = null;
+    boolean isClosed = false;
     public DetachableInputStream(InputStream in) {
         super(in);
         count = 0;
@@ -73,14 +77,28 @@
      * @throws IOException
      */
     public void detach() throws IOException {
-        if (localStream == null) {
+        if (localStream == null && !isClosed) {
 
             BAAOutputStream baaos = new BAAOutputStream();
-            BufferUtils.inputStream2OutputStream(in, baaos);
-            super.close();
-            in = null; // GC the incoming stream
+            try {
+                // It is possible that the underlying stream was closed
+                BufferUtils.inputStream2OutputStream(in, baaos);
+                super.close();
+            } catch (Throwable t) {
+                if (log.isDebugEnabled()) {
+                    log.debug("detach caught exception.  Processing continues:" 
+                              + t);
+                    log.debug("  " + stackToString(t));
+                }
+            } finally {
+                in = null; // GC the incoming stream
+            }
             
             localStream = new BAAInputStream(baaos.buffers(), baaos.length());
+            if (log.isDebugEnabled()) {
+                log.debug("The local stream built from the detached " +
+                                "stream has a length of:" + baaos.length());
+            }
             count = count + baaos.length();
         }
     }
@@ -94,6 +112,7 @@
     }
 
     public void close() throws IOException {
+        isClosed = true;
         if (localStream != null) {
             localStream.close();
         } else {
@@ -163,7 +182,15 @@
         }
     }
 
-
+    private static String stackToString(Throwable e) {
+        java.io.StringWriter sw = new java.io.StringWriter();
+        java.io.BufferedWriter bw = new java.io.BufferedWriter(sw);
+        java.io.PrintWriter pw = new java.io.PrintWriter(bw);
+        e.printStackTrace(pw);
+        pw.close();
+        String text = sw.getBuffer().toString();   
+        return text;
+    }
 
 
 }