svn commit: r1453185 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

[rmannibucau]

Author: rmannibucau
Date: Wed Mar  6 07:57:44 2013
New Revision: 1453185

URL: http://svn.apache.org/r1453185
Log:
avoiding NPE

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1453185&r1=1453184&r2=1453185&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Wed Mar  6 07:57:44 2013
@@ -860,7 +860,7 @@ public class Assembler extends Assembler
         final Collection<Scheduler> schedulers = new ArrayList<Scheduler>();
         for (final BeanContext ejb : appContext.getBeanContexts()) {
             final Scheduler scheduler = ejb.get(Scheduler.class);
-            if (scheduler == globalScheduler || 
schedulers.contains(scheduler)) {
+            if (scheduler == null ||    scheduler == globalScheduler || 
schedulers.contains(scheduler)) {
                 continue;
             }