Removes check null container at ActivationConfigPropertyOverride
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2418cef4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2418cef4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2418cef4 Branch: refs/heads/master Commit: 2418cef4c4fa38c2efde77ecd6de86023c337830 Parents: c3ec634 Author: Otavio Santana <[email protected]> Authored: Fri Jul 14 10:38:22 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Fri Jul 14 10:38:22 2017 -0300 ---------------------------------------------------------------------- .../apache/openejb/config/ActivationConfigPropertyOverride.java | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/2418cef4/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java index 86f36b9..ef60815 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java @@ -37,7 +37,6 @@ import org.apache.openejb.util.PropertyPlaceHolderHelper; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.Set; /** * @version $Rev$ $Date$ @@ -146,10 +145,6 @@ public class ActivationConfigPropertyOverride implements DynamicDeployer { final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class); - if (containerSystem == null) { - return null; - } - if (containerId == null || containerId.length() == 0) { final Container[] containers = containerSystem.containers(); for (Container container : containers) {
