Author: rmannibucau
Date: Thu Jul 25 07:43:15 2013
New Revision: 1506834
URL: http://svn.apache.org/r1506834
Log:
TOMEE-1008 EJBContainer can get null as properties
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1506834&r1=1506833&r2=1506834&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
Thu Jul 25 07:43:15 2013
@@ -76,6 +76,7 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -301,6 +302,10 @@ public class OpenEjbContainer extends EJ
@Override
public EJBContainer createEJBContainer(Map<?, ?> map) {
+ if (map == null) { // JBoss EJB API pass null when calling
EJBContainer.createEJBContainer()
+ map = new HashMap<Object, Object>();
+ }
+
if (isOtherProvider(map)) return null;
if (instance != null || OpenEJB.isInitialized()) {
