Author: shawkins Date: 2011-08-16 10:37:23 -0400 (Tue, 16 Aug 2011) New Revision: 3384 Modified: branches/7.4.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java Log: TEIID-1708 triggering a redeploy of the master vdb during a merge Modified: branches/7.4.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java =================================================================== --- branches/7.4.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2011-08-16 14:25:21 UTC (rev 3383) +++ branches/7.4.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2011-08-16 14:37:23 UTC (rev 3384) @@ -302,9 +302,12 @@ if (target == null) { throw new AdminProcessingException(RuntimePlugin.Util.getString("vdb_not_found", sourceVDBName, sourceVDBVersion)); //$NON-NLS-1$ } - + + notifyRemove(targetVDBName, targetVDBVersion); // merge them target.addChild(source); + + notifyAdd(targetVDBName, targetVDBVersion); } // this is called by mc