[jboss-cvs] JBossAS SVN: r94097 - projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl.

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

Author: jesper.pedersen
Date: 2009-09-29 09:01:10 -0400 (Tue, 29 Sep 2009)
New Revision: 94097

Modified:
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java
Log:
Verify preconditions for methods

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java	2009-09-29 12:03:37 UTC (rev 94096)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java	2009-09-29 13:01:10 UTC (rev 94097)
@@ -39,15 +39,15 @@
    private KernelImpl kernel;
    private List<Deployer> deployers;
 
-   /** Logging */
-   private static Object logging;
-
    /**
     * Constructor
     * @param kernel The kernel
     */
    public MainDeployer(KernelImpl kernel)
    {
+      if (kernel == null)
+         throw new IllegalArgumentException("Kernel is null");
+
       this.kernel = kernel;
       this.deployers = new ArrayList<Deployer>();
    }
@@ -58,11 +58,14 @@
     */
    public void addDeployer(Deployer deployer)
    {
+      if (deployer == null)
+         throw new IllegalArgumentException("Deployer is null");
+
       deployers.add(deployer);
    }
 
    /**
-    * Deploy
+    * Deploy uses the kernel class loader as the parent class loader
     * @param url The URL for the deployment
     * @exception Throwable If an error occurs
     */
@@ -74,11 +77,17 @@
    /**
     * Deploy
     * @param url The URL for the deployment
-    * @param classLoader The class loader
+    * @param classLoader The parent class loader for the deployment
     * @exception Throwable If an error occurs
     */
    public synchronized void deploy(URL url, ClassLoader classLoader) throws Throwable
    {
+      if (url == null)
+         throw new IllegalArgumentException("URL is null");
+
+      if (classLoader == null)
+         throw new IllegalArgumentException("ClassLoader is null");
+
       boolean done = false;
 
       for (int i = 0; !done && i < deployers.size(); i++)
@@ -101,17 +110,9 @@
     */
    public synchronized void undeploy(URL url) throws Throwable
    {
-      undeploy(url, kernel.getKernelClassLoader());
-   }
+      if (url == null)
+         throw new IllegalArgumentException("URL is null");
 
-   /**
-    * Undeploy
-    * @param url The URL for the deployment
-    * @param classLoader The class loader
-    * @exception Throwable If an error occurs
-    */
-   public synchronized void undeploy(URL url, ClassLoader classLoader) throws Throwable
-   {
       Deployment deployment = kernel.findDeployment(url);
       if (deployment != null)
          kernel.shutdownDeployment(deployment);