[jboss-cvs] JBossAS SVN: r106600 - projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers.

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

Author: alesj
Date: 2010-07-12 11:24:12 -0400 (Mon, 12 Jul 2010)
New Revision: 106600

Modified:
   projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/AbstractScanningHandleAggregator.java
Log:
Better merge.

Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/AbstractScanningHandleAggregator.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/AbstractScanningHandleAggregator.java	2010-07-12 15:17:53 UTC (rev 106599)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/AbstractScanningHandleAggregator.java	2010-07-12 15:24:12 UTC (rev 106600)
@@ -76,7 +76,9 @@
                   if (result == null)
                      result = tmp;
                   else
-                     ((Map)result).putAll(((Map)tmp));
+                  {
+                     MergeUtils.singleMerge(((Map)result), ((Map)tmp));
+                  }
                }
                else
                {