Author: fmui
Date: Fri Sep 9 09:19:06 2016
New Revision: 1759962
URL: http://svn.apache.org/viewvc?rev=1759962&view=rev
Log:
Server: make it compilable with Java 6 again
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/CmisAtomPubServlet.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/CmisBrowserBindingServlet.java
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/CmisAtomPubServlet.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/CmisAtomPubServlet.java?rev=1759962&r1=1759961&r2=1759962&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/CmisAtomPubServlet.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/CmisAtomPubServlet.java
Fri Sep 9 09:19:06 2016
@@ -225,8 +225,8 @@ public class CmisAtomPubServlet extends
printError(e, request, response);
}
- } catch (Throwable t) {
- LOG.error(createLogMessage(t, request), t);
+ } catch (Error err) {
+ LOG.error(createLogMessage(err, request), err);
try {
response.resetBuffer();
@@ -235,7 +235,7 @@ public class CmisAtomPubServlet extends
response.setCharacterEncoding(IOUtils.UTF8);
PrintWriter pw = response.getWriter();
- writeHtmlErrorPage(pw, 500, "runtime", "An error occurred!",
t);
+ writeHtmlErrorPage(pw, 500, "runtime", "An error occurred!",
err);
pw.flush();
} catch (Exception te) {
// we tried to send an error message but it failed.
@@ -243,7 +243,7 @@ public class CmisAtomPubServlet extends
flush = false;
}
- throw t;
+ throw err;
} finally {
// we are done.
if (flush) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/CmisBrowserBindingServlet.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/CmisBrowserBindingServlet.java?rev=1759962&r1=1759961&r2=1759962&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/CmisBrowserBindingServlet.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/CmisBrowserBindingServlet.java
Fri Sep 9 09:19:06 2016
@@ -280,8 +280,8 @@ public class CmisBrowserBindingServlet e
printError(context, e, request, response);
}
- } catch (Throwable t) {
- LOG.error(createLogMessage(t, request), t);
+ } catch (Error err) {
+ LOG.error(createLogMessage(err, request), err);
try {
response.resetBuffer();
@@ -298,7 +298,7 @@ public class CmisBrowserBindingServlet e
flush = false;
}
- throw t;
+ throw err;
} finally {
// in any case close the content stream if one has been provided
if (request instanceof POSTHttpServletRequestWrapper) {
