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 2017/06/19 19:19:47 UTC
tomee git commit: fixing checkstyle
Repository: tomee
Updated Branches:
refs/heads/master d5b3b93d4 -> e1e10296b
fixing checkstyle
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e1e10296
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e1e10296
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e1e10296
Branch: refs/heads/master
Commit: e1e10296b05c3edb28ccf6cb323b98d2af572ac0
Parents: d5b3b93
Author: rmannibucau <rm...@apache.org>
Authored: Mon Jun 19 20:50:47 2017 +0200
Committer: rmannibucau <rm...@apache.org>
Committed: Mon Jun 19 20:50:47 2017 +0200
----------------------------------------------------------------------
.../openejb/assembler/classic/Assembler.java | 24 ++++++++++----------
.../apache/openejb/core/ivm/ContextHandler.java | 2 +-
.../openejb/core/ivm/naming/NameNode.java | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e1e10296/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 156dfed..9dca73a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -1035,7 +1035,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
//required by spec EE.5.3.4
if(setAppNamingContextReadOnly(allDeployments)) {
- logger.info("createApplication.naming", appInfo.path);
+ logger.info("createApplication.naming", appInfo.path);
}
return appContext;
@@ -1059,16 +1059,16 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
boolean setAppNamingContextReadOnly(final List<BeanContext> allDeployments) {
if("true".equals(SystemInstance.get().getProperty(FORCE_READ_ONLY_APP_NAMING, "false"))) {
- for(BeanContext beanContext : allDeployments) {
- Context ctx = beanContext.getJndiContext();
-
- if(IvmContext.class.isInstance(ctx)) {
- IvmContext.class.cast(ctx).setReadOnly(true);
- } else if(ContextHandler.class.isInstance(ctx)) {
- ContextHandler.class.cast(ctx).setReadOnly();
- }
- }
- return true;
+ for(BeanContext beanContext : allDeployments) {
+ Context ctx = beanContext.getJndiContext();
+
+ if(IvmContext.class.isInstance(ctx)) {
+ IvmContext.class.cast(ctx).setReadOnly(true);
+ } else if(ContextHandler.class.isInstance(ctx)) {
+ ContextHandler.class.cast(ctx).setReadOnly();
+ }
+ }
+ return true;
}
return false;
}
@@ -2168,7 +2168,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
if(IvmContext.class.isInstance(globalContext)) {
- IvmContext.class.cast(globalContext).setReadOnly(false);
+ IvmContext.class.cast(globalContext).setReadOnly(false);
}
unbind(globalContext, path);
http://git-wip-us.apache.org/repos/asf/tomee/blob/e1e10296/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
index a9b94b2..bf054c4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
@@ -101,7 +101,7 @@ public class ContextHandler extends ContextWrapper {
public void setReadOnly() {
if(IvmContext.class.isInstance(context)) {
- IvmContext.class.cast(context).setReadOnly(true);
+ IvmContext.class.cast(context).setReadOnly(true);
}
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/e1e10296/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
index 9ca9276..c544e9c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
@@ -314,7 +314,7 @@ public class NameNode implements Serializable {
while(federatedContextsIterator.hasNext()) {
Context current = federatedContextsIterator.next();
if(IvmContext.class.isInstance(current)) {
- IvmContext.class.cast(current).setReadOnly(isReadOnly);
+ IvmContext.class.cast(current).setReadOnly(isReadOnly);
}
}
}