svn commit: r1810563 - /sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java

[justin]

Author: justin
Date: Mon Oct  2 17:37:53 2017
New Revision: 1810563

URL: http://svn.apache.org/viewvc?rev=1810563&view=rev
Log:
SLING-7174 - catch Exception in ExportServlet when accessing reader

Modified:
    
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java

Modified: 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java?rev=1810563&r1=1810562&r2=1810563&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java
 (original)
+++ 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/ExportServlet.java
 Mon Oct  2 17:37:53 2017
@@ -18,7 +18,9 @@
  */
 package org.apache.sling.models.impl;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.StringReader;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -121,7 +123,11 @@ class ExportServlet extends SlingSafeMet
         bindings.put(SlingModelsScriptEngineFactory.RESOLVER, 
request.getResource().getResourceResolver());
         bindings.put(REQUEST, request);
         bindings.put(RESPONSE, response);
-        bindings.put(READER, request.getReader());
+        try {
+            bindings.put(READER, request.getReader());
+        } catch (Exception e) {
+            bindings.put(READER, new BufferedReader(new StringReader("")));
+        }
         bindings.put(OUT, response.getWriter());
         bindings.put(LOG, logger);