[jbossws-commits] JBossWS SVN: r15889 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-03-06 10:49:28 -0500 (Tue, 06 Mar 2012)
New Revision: 15889

Modified:
   stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java
Log:
[JBWS-3453] Extend Spring availability check to JBossWSBusFactory defining classloader


Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java	2012-03-06 15:48:09 UTC (rev 15888)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java	2012-03-06 15:49:28 UTC (rev 15889)
@@ -49,7 +49,7 @@
    @Override
    public Bus createBus()
    {
-      if (SpringUtils.isSpringAvailable())
+      if (isSpringAvailable())
       {
          return getSpringBusFactory().createBus();
       }
@@ -59,6 +59,13 @@
       }
    }
    
+   private boolean isSpringAvailable() {
+      // Spring is available iff:
+      // 1) TCCL has Spring classes
+      // 2) the SpringBusFactory has already been loaded or the defining classloader can load that
+      return (SpringUtils.isSpringAvailable() && (springBusFactory != null || SpringUtils.isSpringAvailable(this.getClass().getClassLoader())));
+   }
+   
    /** JBossWSSpringBusFactory methods **/
    public Bus createBus(String cfgFile)
    {