You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/07/02 22:30:26 UTC
tomee git commit: Fix instance variable
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 4cfb293d0 -> a9cc3bbd0
Fix instance variable
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a9cc3bbd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a9cc3bbd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a9cc3bbd
Branch: refs/heads/tomee-1.7.x
Commit: a9cc3bbd015bd831ca323531c2a793bff162d1d5
Parents: 4cfb293
Author: AndyGee <an...@gmx.de>
Authored: Thu Jul 2 22:29:59 2015 +0200
Committer: AndyGee <an...@gmx.de>
Committed: Thu Jul 2 22:29:59 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/openejb/resource/ResourceSortingTest.java | 5 +++--
.../src/main/java/org/apache/openejb/client/JNDIContext.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a9cc3bbd/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java
index 00486ad..2948600 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java
@@ -54,7 +54,8 @@ public class ResourceSortingTest {
.append("name foo:bar=Hello").append(c).append("</Resource>");
}
resourcesXml.append("</Resources>");
- return JaxbOpenejb.unmarshal(Resources.class, new ByteArrayInputStream(resourcesXml.toString().getBytes()));
+ final Resources unmarshal = JaxbOpenejb.unmarshal(Resources.class, new ByteArrayInputStream(resourcesXml.toString().getBytes()));
+ return unmarshal;
}
@Test
@@ -74,7 +75,7 @@ public class ResourceSortingTest {
private static final List<String> IDS = new ArrayList<String>();
private String name;
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
IDS.add(name);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/a9cc3bbd/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
----------------------------------------------------------------------
diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java b/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
index 08e7537..df34d43 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
@@ -66,7 +66,6 @@ import java.util.logging.Logger;
*/
public class JNDIContext implements InitialContextFactory, Context {
private static final Logger LOGGER = Logger.getLogger("OpenEJB.client");
- private static final AtomicBoolean isShutdown = new AtomicBoolean(false);
@SuppressWarnings("UnusedDeclaration")
public static final String DEFAULT_PROVIDER_URL = "ejbd://localhost:4201";
@@ -78,6 +77,7 @@ public class JNDIContext implements InitialContextFactory, Context {
public static final String AUTHENTICATION_REALM_NAME = "openejb.authentication.realmName";
public static final String IDENTITY_TIMEOUT = "tomee.authentication.identity.timeout";
+ private final AtomicBoolean isShutdown = new AtomicBoolean(false);
private String tail = "/";
private ServerMetaData server;
private ClientMetaData client;