fix conflicts
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ac58b0d1 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ac58b0d1 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ac58b0d1 Branch: refs/heads/tomee-1.7.x Commit: ac58b0d139c1da6434c9b51443459bf18c76763f Parents: 952050a Author: Otavio Santana <[email protected]> Authored: Fri Dec 15 07:37:45 2017 -0300 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 17 11:32:42 2018 -0500 ---------------------------------------------------------------------- .../openejb/core/mdb/EndpointHandler.java | 30 +----------- .../openejb/core/mdb/PoolEndpointHandler.java | 31 +------------ .../java/org/apache/openejb/core/mdb/State.java | 49 ++++++++++++++++++++ 3 files changed, 51 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ac58b0d1/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 bba9acb..489ace2 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 @@ -31,36 +31,8 @@ import java.lang.reflect.Method; import java.util.Arrays; public class EndpointHandler implements InvocationHandler, MessageEndpoint { - private enum State { - /** - * The handler has been initialized and is ready for invoation - */ - NONE, + private volatile Boolean isAmq; - /** - * The beforeDelivery method has been called, and the next method called must be a message delivery method - * or release. - */ - BEFORE_CALLED, - - /** - * The message delivery method has been called successfully, and the next method called must be - * another message delivery method, afterDelivery, or release. - */ - METHOD_CALLED, - - /** - * The message delivery threw a system exception, and the next method called must be afterDelivery - * or release. This state notified the afterDelivery method that the instace must be replaced with a new - * instance. - */ - SYSTEM_EXCEPTION, - - /** - * This message endpoint handler has been released and can no longer be used. - */ - RELEASED - } private final BaseMdbContainer container; private final BeanContext deployment; http://git-wip-us.apache.org/repos/asf/tomee/blob/ac58b0d1/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java index 6e9d9a7..cc1cc13 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java @@ -38,36 +38,7 @@ import java.util.Arrays; public class PoolEndpointHandler implements InvocationHandler, MessageEndpoint { private volatile Boolean isAmq; - private static enum State { - /** - * The handler has been initialized and is ready for invoation - */ - NONE, - - /** - * The beforeDelivery method has been called, and the next method called must be a message delivery method - * or release. - */ - BEFORE_CALLED, - - /** - * The message delivery method has been called successfully, and the next method called must be - * another message delivery method, afterDelivery, or release. - */ - METHOD_CALLED, - - /** - * The message delivery threw a system exception, and the next method called must be afterDelivery - * or release. This state notified the afterDelivery method that the instace must be replaced with a new - * instance. - */ - SYSTEM_EXCEPTION, - - /** - * This message endpoint handler has been released and can no longer be used. - */ - RELEASED - } + private final BaseMdbContainer container; private final BeanContext deployment; http://git-wip-us.apache.org/repos/asf/tomee/blob/ac58b0d1/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/State.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/State.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/State.java new file mode 100644 index 0000000..285468a --- /dev/null +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/State.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.openejb.core.mdb; + +enum State { + /** + * The handler has been initialized and is ready for invoation + */ + NONE, + + /** + * The beforeDelivery method has been called, and the next method called must be a message delivery method + * or release. + */ + BEFORE_CALLED, + + /** + * The message delivery method has been called successfully, and the next method called must be + * another message delivery method, afterDelivery, or release. + */ + METHOD_CALLED, + + /** + * The message delivery threw a system exception, and the next method called must be afterDelivery + * or release. This state notified the afterDelivery method that the instace must be replaced with a new + * instance. + */ + SYSTEM_EXCEPTION, + + /** + * This message endpoint handler has been released and can no longer be used. + */ + RELEASED +}
