[jboss-cvs] JBossAS SVN: r74477 - projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-06-12 07:20:12 -0400 (Thu, 12 Jun 2008)
New Revision: 74477

Modified:
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java
Log:
Create UF lazy.

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java	2008-06-12 11:14:58 UTC (rev 74476)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java	2008-06-12 11:20:12 UTC (rev 74477)
@@ -58,10 +58,6 @@
 
    public void start() throws Exception
    {
-      UnmarshallerFactory<U> unmarshallerFactory = createUnmarshallerFactory();
-      if (unmarshallerFactory == null)
-         throw new IllegalArgumentException("Unmarshaller factory cannot be null.");
-
       Map<String,U> features = getFeatures();
       if (isUseDefaultFeatures())
       {
@@ -77,6 +73,10 @@
 
       if (features != null && features.isEmpty() == false)
       {
+         UnmarshallerFactory<U> unmarshallerFactory = createUnmarshallerFactory();
+         if (unmarshallerFactory == null)
+            throw new IllegalArgumentException("Unmarshaller factory cannot be null.");
+
          for(Map.Entry<String,U> entry : features.entrySet())
             unmarshallerFactory.setFeature(entry.getKey(), entry.getValue());
       }