[jboss-cvs] JBossAS SVN: r81433 - projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory.

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

Author: alesj
Date: 2008-11-21 10:05:58 -0500 (Fri, 21 Nov 2008)
New Revision: 81433

Modified:
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory/ConfigurableManagedObjectDefinition.java
Log:
[JBMAn-40]; use default if no factory is set.

Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory/ConfigurableManagedObjectDefinition.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory/ConfigurableManagedObjectDefinition.java	2008-11-21 14:57:19 UTC (rev 81432)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/factory/ConfigurableManagedObjectDefinition.java	2008-11-21 15:05:58 UTC (rev 81433)
@@ -37,6 +37,11 @@
    {
    }
 
+   public ConfigurableManagedObjectDefinition(Class<?> type, ManagedObjectBuilder builder)
+   {
+      super(type, builder);
+   }
+
    public ConfigurableManagedObjectDefinition(ManagedObjectFactory factory)
    {
       this(factory, null, null);
@@ -48,10 +53,22 @@
       this.factory = factory;
    }
 
-   @Override
-   public boolean isValid()
+   /**
+    * Get factory internal.
+    *
+    * This method should be used
+    * when internally accessing MO factory
+    * as it will return default instance in case
+    * factory is not explicitly set. 
+    *
+    * @return the MO factory
+    */
+   protected ManagedObjectFactory getMOFactory()
    {
-      return super.isValid() && factory != null;
+      if (factory == null)
+         factory = ManagedObjectFactory.getInstance();
+
+      return factory;     
    }
 
    /**
@@ -62,7 +79,7 @@
       if (isValid() == false)
          throw new IllegalArgumentException("Definition is invalid: " + toString());
 
-      factory.setBuilder(getType(), getBuilder());
+      getMOFactory().setBuilder(getType(), getBuilder());
    }
 
    /**
@@ -75,7 +92,7 @@
       if (getType() == null)
          throw new IllegalArgumentException("Missing type");
 
-      factory.setBuilder(getType(), null);
+      getMOFactory().setBuilder(getType(), null);
    }
 
    /**