Repository: tomee Updated Branches: refs/heads/master 0eea136c7 -> b071814bf
style Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b071814b Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b071814b Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b071814b Branch: refs/heads/master Commit: b071814bf6300bc33e314d8212488acdf9d86488 Parents: 0eea136 Author: Romain Manni-Bucau <rmannibu...@gmail.com> Authored: Wed Dec 6 14:39:55 2017 +0100 Committer: Romain Manni-Bucau <rmannibu...@gmail.com> Committed: Wed Dec 6 14:39:55 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/config/AppInfoBuilder.java | 3 +-- .../src/main/java/org/apache/openejb/config/AutoConfig.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b071814b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java index 3c79cff..6d112e1 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java @@ -370,8 +370,7 @@ class AppInfoBuilder { private void buildAppContainers(final AppModule module, final AppInfo info) throws OpenEJBException { final List<ContainerInfo> containerInfos = getContainerInfos(module); - if (containerInfos == null) return; - + if (containerInfos == null) { return; } info.containers.addAll(containerInfos); } http://git-wip-us.apache.org/repos/asf/tomee/blob/b071814b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java index 689fd23..5f1ec3f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java @@ -22,7 +22,6 @@ import org.apache.openejb.OpenEJBException; import org.apache.openejb.assembler.classic.ContainerInfo; import org.apache.openejb.assembler.classic.MdbContainerInfo; import org.apache.openejb.assembler.classic.ResourceInfo; -import org.apache.openejb.config.sys.Container; import org.apache.openejb.config.sys.Resource; import org.apache.openejb.jee.ActivationConfig; import org.apache.openejb.jee.ActivationConfigProperty;
