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 2016/07/26 06:45:40 UTC

tomee git commit: TOMEE-1886 add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code

Repository: tomee
Updated Branches:
  refs/heads/master 20ea8808a -> f54517fb3


TOMEE-1886 add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f54517fb
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f54517fb
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f54517fb

Branch: refs/heads/master
Commit: f54517fb398807ed46120caa08ee841399656254
Parents: 20ea880
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Jul 26 08:44:59 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Jul 26 08:44:59 2016 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/tomee/embedded/Container.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/f54517fb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index bb2ccd5..d3d5538 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -278,7 +278,9 @@ public class Container implements AutoCloseable {
             throw new IllegalStateException(e);
         }
 
-        addCallersAsEjbModule(loader, app, additionalCallers);
+        if (!SystemInstance.isInitialized() || Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.embedded.add-callers", "true"))) {
+            addCallersAsEjbModule(loader, app, additionalCallers);
+        }
 
         systemInstance.addObserver(new StandardContextCustomizer(configuration, webModule, keepClassloader));
         if (systemInstance.getComponent(AnnotationDeployer.FolderDDMapper.class) == null) {