Changes for JIRA issue WBRI-177

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1966 1c488680-804c-0410-94cd-c6b725194a0e
weld · Mar 13, 2009 · eb4be09 · eb4be09
1 parent 29c1273
commit eb4be09
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java b/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -899,12 +899,12 @@ public NamingContext getNaming()
       return namingContext;
    }
 
-   public EjbResolver getEjbResolver()
+   public final EjbResolver getEjbResolver()
    {
       return ejbResolver;
    }
 
-   public ResourceLoader getResourceLoader()
+   public final ResourceLoader getResourceLoader()
    {
       return resourceLoader;
    }
@@ -915,7 +915,7 @@ public ResourceLoader getResourceLoader()
     * 
     * @return a TransactionServices provider per the SPI
     */
-   public TransactionServices getTransactionServices()
+   public final TransactionServices getTransactionServices()
    {
       return transactionServices;
    }

diff --git a/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java b/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
@@ -83,7 +83,7 @@ public void initialize()
       }
       if (getTransactionServices() == null)
       {
-         throw new IllegalStateException("TransactionServices is not set");
+         log.info("Transactional services not available.  Transactional observers will be invoked synchronously.");
       }
       this.manager = new ManagerImpl(getNamingContext(), getEjbResolver(), getResourceLoader(), getTransactionServices());
       getManager().getNaming().bind(ManagerImpl.JNDI_KEY, getManager());

diff --git a/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java b/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java
@@ -87,7 +87,7 @@ protected void init()
    @Override
    public void notify(T event)
    {
-      if (manager.getTransactionServices().isTransactionActive())
+      if ((manager.getTransactionServices() != null)  && (manager.getTransactionServices().isTransactionActive()))
       {
          deferEvent(event);
       }