tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: wrong parenthesis
Date Wed, 17 Aug 2016 16:18:21 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 78358fc20 -> 4f47af0d3


wrong parenthesis


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

Branch: refs/heads/master
Commit: 4f47af0d3b94997201c5d2fb3f693fb4e94dcf5b
Parents: 78358fc
Author: Romain manni-Bucau <rmannibucau@gmail.com>
Authored: Wed Aug 17 18:18:15 2016 +0200
Committer: Romain manni-Bucau <rmannibucau@gmail.com>
Committed: Wed Aug 17 18:18:15 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/openejb/config/AnnotationDeployer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/4f47af0d/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index e212638..2302579 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -1569,8 +1569,8 @@ public class AnnotationDeployer implements DynamicDeployer {
         private boolean isActivateCdiForEjbOnlyModules(final EjbModule ejbModule) {
             final String activated = ejbModule.getProperties().getProperty("openejb.cdi.activated");
             final String globalConfig = SystemInstance.get().getProperty("openejb.cdi.activated-on-ejb");
// spec should be true but mem + bck compat
-            return (globalConfig == null || Boolean.parseBoolean(globalConfig) &&
-                    (activated == null && hasAtInject(ejbModule)) || (activated !=
null && Boolean.parseBoolean(activated)));
+            return (globalConfig == null || Boolean.parseBoolean(globalConfig)) &&
+                    ((activated == null && hasAtInject(ejbModule)) || (activated
!= null && Boolean.parseBoolean(activated)));
         }
 
         // quick heuristic to guess if cdi is needed, avoid to need more mem when useless


Mime
View raw message