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 2015/12/24 16:00:45 UTC
tomee git commit: TOMEE-1686 dont access args is empty
Repository: tomee
Updated Branches:
refs/heads/master 0b0a8983c -> 38accaea4
TOMEE-1686 dont access args is empty
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/38accaea
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/38accaea
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/38accaea
Branch: refs/heads/master
Commit: 38accaea46c04865797f4355dede201aa7a096a4
Parents: 0b0a898
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Thu Dec 24 16:00:44 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Thu Dec 24 16:00:44 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/core/cmp/CmpContainer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/38accaea/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
index 79ee5c1..27a9454 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
@@ -731,8 +731,7 @@ public class CmpContainer implements RpcContainer {
if (results.size() != 1) {
throw new ObjectNotFoundException("A Enteprise bean with deployment_id = " +
beanContext.getDeploymentID() +
- " and primarykey = " +
- args[0] +
+ (args != null && args.length >= 1 ? " and primarykey = " + args[0] : "") +
" Does not exist");
}