[jboss-cvs] JBossAS SVN: r106033 - projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate.

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

Author: alesj
Date: 2010-06-14 11:22:36 -0400 (Mon, 14 Jun 2010)
New Revision: 106033

Modified:
   projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
Log:
Fix merge.

Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java	2010-06-14 13:52:08 UTC (rev 106032)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java	2010-06-14 15:22:36 UTC (rev 106033)
@@ -330,7 +330,7 @@
             if (cacheNewResults)
             {
                if (map != null)
-                  map.putAll(temp);
+                  MergeUtils.singleMerge(map, temp);
                else
                   classes.put(jartoScan.getPath(), temp);
             }