[jboss-cvs] JBossAS SVN: r95386 - projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository.

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

Author: alesj
Date: 2009-10-22 05:04:52 -0400 (Thu, 22 Oct 2009)
New Revision: 95386

Modified:
   projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository/DefaultConfiguration.java
Log:
Check null.

Modified: projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository/DefaultConfiguration.java
===================================================================
--- projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository/DefaultConfiguration.java	2009-10-22 09:01:57 UTC (rev 95385)
+++ projects/mc-ann/trunk/core/src/main/java/org/jboss/mcann/repository/DefaultConfiguration.java	2009-10-22 09:04:52 UTC (rev 95386)
@@ -49,6 +49,9 @@
 
    public void merge(Configuration configuration)
    {
+      if (configuration == null)
+         throw new IllegalArgumentException("Null configuration.");
+
       setResourceFilter(configuration.resourceFilter());
       setForceAnnotations(configuration.forceAnnotations());
       setKeepAnnotations(configuration.keepAnnotations());