Stop-gap measure to have errors show up in Firefox

geoserver · Mar 24, 2017 · c02e372 · c02e372
1 parent 344bfae
commit c02e372
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/...munity/oseo/oseo-core/src/main/java/org/geoserver/opensearch/eo/OSEOExceptionHandler.java b/...munity/oseo/oseo-core/src/main/java/org/geoserver/opensearch/eo/OSEOExceptionHandler.java
@@ -37,7 +37,7 @@ public OSEOExceptionHandler(List services, GeoServer geoServer) {
     @Override
     public void handleServiceException(ServiceException exception, Request request) {
         HttpServletResponse response = request.getHttpResponse();
-        response.setContentType(RSS_MIME);
+        response.setContentType("application/xml");
 
         if (exception instanceof OWS20Exception) {
             OWS20Exception ex = (OWS20Exception) exception;

diff --git a/...oseo-core/src/main/java/org/geoserver/opensearch/eo/response/RSSExceptionTransformer.java b/...oseo-core/src/main/java/org/geoserver/opensearch/eo/response/RSSExceptionTransformer.java
@@ -58,6 +58,21 @@ public RSSExceptionTransformer(GeoServerInfo geoServer, Request request) {
     public Translator createTranslator(ContentHandler handler) {
         return new ExceptionTranslator(handler);
     }
+
+    public static String getDescription(GeoServerInfo geoServer, ServiceException e) {
+        StringBuffer sb = new StringBuffer();
+        OwsUtils.dumpExceptionMessages(e, sb, true);
+
+        if (geoServer.getSettings().isVerboseExceptions()) {
+            ByteArrayOutputStream stackTrace = new ByteArrayOutputStream();
+            e.printStackTrace(new PrintStream(stackTrace));
+
+            sb.append("\nDetails:\n");
+            sb.append(ResponseUtils.encodeXML(new String(stackTrace.toByteArray())));
+        }
+
+        return sb.toString();
+    }
 
     class ExceptionTranslator extends LambdaTranslatorSupport {
 
@@ -86,22 +101,7 @@ private void channel(ServiceException e) {
 
         private void itemContents(ServiceException e) {
             element("title", e.getMessage());
-            element("description", getDescription(e));
-        }
-
-        private String getDescription(ServiceException e) {
-            StringBuffer sb = new StringBuffer();
-            OwsUtils.dumpExceptionMessages(e, sb, true);
-
-            if (geoServer.getSettings().isVerboseExceptions()) {
-                ByteArrayOutputStream stackTrace = new ByteArrayOutputStream();
-                e.printStackTrace(new PrintStream(stackTrace));
-
-                sb.append("\nDetails:\n");
-                sb.append(ResponseUtils.encodeXML(new String(stackTrace.toByteArray())));
-            }
-
-            return sb.toString();
+            element("description", getDescription(geoServer, e));
         }
 
         private String buildSelfUrl() {

diff --git a/src/community/oseo/oseo-core/src/test/java/org/geoserver/opensearch/eo/OSEOTestSupport.java b/src/community/oseo/oseo-core/src/test/java/org/geoserver/opensearch/eo/OSEOTestSupport.java
@@ -174,7 +174,7 @@ protected void checkValidAtomFeed(Document d) throws SAXException, IOException {
      * @throws Exception
      */
     protected Document getAsOpenSearchException(String path, int expectedStatus) throws Exception {
-        return getAsDOM(path, expectedStatus, OSEOExceptionHandler.RSS_MIME);
+        return getAsDOM(path, expectedStatus, "application/xml"); // OSEOExceptionHandler.RSS_MIME);
     }
 
     /**

diff --git a/src/community/oseo/oseo-core/src/test/java/org/geoserver/opensearch/eo/SearchTest.java b/src/community/oseo/oseo-core/src/test/java/org/geoserver/opensearch/eo/SearchTest.java
@@ -169,7 +169,7 @@ public void testPagingPartialPages() throws Exception {
     @Test
     public void testGeoUidCollectionQuery() throws Exception {
         Document dom = getAsDOM("oseo/search?uid=LANDSAT8&httpAccept=" + AtomSearchResponse.MIME);
-        print(dom);
+        // print(dom);
 
         // basics
         assertThat(dom, hasXPath("/at:feed/os:totalResults", equalTo("1")));