You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/24 18:22:31 UTC
tomee git commit: copyright year even for few days + unwrapping
ServletException from filterchain
Repository: tomee
Updated Branches:
refs/heads/develop 8d47ac021 -> 437bf7b2c
copyright year even for few days + unwrapping ServletException from filterchain
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/437bf7b2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/437bf7b2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/437bf7b2
Branch: refs/heads/develop
Commit: 437bf7b2c27a68c62e2d657d96f730bca266facb
Parents: 8d47ac0
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Dec 24 18:06:34 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Dec 24 18:06:34 2014 +0100
----------------------------------------------------------------------
.../src/main/resources/openejb-version.properties | 2 +-
.../org/apache/openejb/server/httpd/FilterListener.java | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/437bf7b2/container/openejb-core/src/main/resources/openejb-version.properties
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/openejb-version.properties b/container/openejb-core/src/main/resources/openejb-version.properties
index d395844..64e5552 100644
--- a/container/openejb-core/src/main/resources/openejb-version.properties
+++ b/container/openejb-core/src/main/resources/openejb-version.properties
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-copyright=Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
+copyright=Copyright 1999-2014 (C) Apache OpenEJB Project, All Rights Reserved.
url=http://tomee.apache.org/
version=${pom.version}
date=@DATE-REPLACED-BY-MAVEN@
http://git-wip-us.apache.org/repos/asf/tomee/blob/437bf7b2/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/FilterListener.java
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/FilterListener.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/FilterListener.java
index 79f2c1f..b28f3c4 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/FilterListener.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/FilterListener.java
@@ -69,7 +69,17 @@ public class FilterListener implements HttpListener {
registry.setOrigin(origin);
try {
registry.onMessage((HttpRequest) request, (HttpResponse) response);
- } catch (Exception e) {
+ } catch (final RuntimeException re) {
+ throw re;
+ } catch (final ServletException e) {
+ final Throwable cause = e.getCause();
+ if (RuntimeException.class.isInstance(cause)) { // frameworks generally wrap with ServletException
+ throw RuntimeException.class.cast(cause);
+ }
+ throw e;
+ } catch (final IOException e) {
+ throw e;
+ } catch (final Exception e) {
throw new ServletException(e);
} finally {
registry.setOrigin(origin);