You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by ga...@apache.org on 2010/08/23 23:12:01 UTC

svn commit: r988313 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java

Author: gawor
Date: Mon Aug 23 21:12:00 2010
New Revision: 988313

URL: http://svn.apache.org/viewvc?rev=988313&view=rev
Log:
pass an empty application id to prevent NPEs and to ensure proper global jndi names are used

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=988313&r1=988312&r2=988313&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Mon Aug 23 21:12:00 2010
@@ -547,6 +547,9 @@ public class ConfigurationFactory implem
      * @throws OpenEJBException on error
      */
     public AppInfo configureApplication(ClassLoader classLoader, String id, List<File> jarFiles) throws OpenEJBException {
+        if (id == null) {
+            id = "";
+        }
         Application application = new Application();
         application.setApplicationName(id);
         AppModule collection = new AppModule(classLoader, id, application, false);