fix conflicts
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a771ef6e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a771ef6e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a771ef6e Branch: refs/heads/tomee-1.7.x Commit: a771ef6e0b9cfa0a5e88ca511961305b44930f27 Parents: b8f17bc Author: Otavio Santana <[email protected]> Authored: Fri Dec 15 07:56:44 2017 -0300 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 17 12:55:02 2018 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/a771ef6e/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java index dfde6b8..0ab2938 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java @@ -66,7 +66,6 @@ public class EndpointHandler extends AbstractEndpointHandler { // before completed successfully we are now ready to invoke bean state = State.BEFORE_CALLED; } - @Override protected void recreateInstance(final boolean exceptionAlreadyThrown) throws UnavailableException { try {
