- Added log traces in case of error with custom status representation.

Jerome Louvel · Jerome Louvel · commit ea9ffc38223a · 2012-07-19T14:47:05.000+02:00
- Fixed potential threading/pipe issues with OutputRepresentation
         and WriterRepresentation classes.
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ modules/org.restlet.ext.xml/bin/
 modules/org.restlet.ext.xstream/bin/
 modules/org.restlet.test/bin/
 modules/org.restlet/bin/
+/build/temp
diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
@@ -13,10 +13,13 @@ Changes log
          cause erros such as "no Restlet defined to process calls. Maybe it
          wasn't properly started" errors (500). Reported by several persons 
          including David Fuchs, Danny Leshem, Yunwu Zhu and Bjorn Roche.
+       - Fixed potential threading/pipe issues with OutputRepresentation
+         and WriterRepresentation classes.
     - Misc
        - Reverted Role equality test to default Java object equality as
          equality based on name could cause issues with MemoryRealm
          mapping if several applications used the same role names.
+       - Added log traces in case of error with custom status representation.
 
 - 2.0.14 (2012-05-23)
     - Bug fixed
diff --git a/modules/org.restlet/src/org/restlet/engine/application/StatusFilter.java b/modules/org.restlet/src/org/restlet/engine/application/StatusFilter.java
@@ -249,8 +249,15 @@ public Reference getHomeRef() {
      */
     protected Representation getRepresentation(Status status, Request request,
             Response response) {
-        Representation result = getStatusService().getRepresentation(status,
-                request, response);
+        Representation result = null;
+
+        try {
+            result = getStatusService().getRepresentation(status, request,
+                    response);
+        } catch (Exception e) {
+            getLogger().log(Level.WARNING,
+                    "Unable to get the custom status representation", e);
+        }
 
         if (result == null) {
             result = getDefaultRepresentation(status, request, response);
diff --git a/modules/org.restlet/src/org/restlet/engine/io/BioUtils.java b/modules/org.restlet/src/org/restlet/engine/io/BioUtils.java
@@ -310,29 +310,37 @@ public static Reader getReader(
             final java.io.PipedWriter pipedWriter = new java.io.PipedWriter();
             java.io.PipedReader pipedReader = new java.io.PipedReader(
                     pipedWriter);
-            org.restlet.Application application = org.restlet.Application
-                    .getCurrent();
+
             // Gets a thread that will handle the task of continuously
             // writing the representation into the input side of the pipe
             Runnable task = new Runnable() {
                 public void run() {
                     try {
                         representation.write(pipedWriter);
                         pipedWriter.flush();
-                        pipedWriter.close();
                     } catch (IOException ioe) {
                         Context.getCurrentLogger()
-                                .log(Level.FINE,
+                                .log(Level.WARNING,
                                         "Error while writing to the piped reader.",
                                         ioe);
+                    } finally {
+                        try {
+                            pipedWriter.close();
+                        } catch (IOException ioe2) {
+                            Context.getCurrentLogger().log(Level.WARNING,
+                                    "Error while closing the pipe.", ioe2);
+                        }
                     }
                 }
             };
 
+            org.restlet.Application application = org.restlet.Application
+                    .getCurrent();
+
             if (application != null && application.getTaskService() != null) {
                 application.getTaskService().execute(task);
             } else {
-                new Thread(task).start();
+                new Thread(task, "Restlet-PipeWriter").start();
             }
 
             result = pipedReader;
@@ -401,27 +409,34 @@ public static InputStream getStream(final Representation representation) {
             }
 
             final PipeStream pipe = new PipeStream();
-            org.restlet.Application application = org.restlet.Application
-                    .getCurrent();
-
-            // Gets a thread that will handle the task of continuously
+            final java.io.OutputStream os = pipe.getOutputStream();
+            
+            // Creates a thread that will handle the task of continuously
             // writing the representation into the input side of the pipe
             Runnable task = new Runnable() {
                 public void run() {
                     try {
-                        java.io.OutputStream os = pipe.getOutputStream();
                         representation.write(os);
                         os.flush();
-                        os.close();
                     } catch (IOException ioe) {
                         Context.getCurrentLogger()
-                                .log(Level.FINE,
-                                        "Error while writing to the piped input stream.",
+                        .log(Level.WARNING,
+                                "Error while writing to the piped input stream.",
                                         ioe);
+                    } finally {
+                        try {
+                            os.close();
+                        } catch (IOException ioe2) {
+                            Context.getCurrentLogger().log(Level.WARNING,
+                                    "Error while closing the pipe.", ioe2);
+                        }
                     }
                 }
             };
 
+            org.restlet.Application application = org.restlet.Application
+                    .getCurrent();
+
             if (application != null && application.getTaskService() != null) {
                 application.getTaskService().execute(task);
             } else {
