From 8c3d560ca8b8413354040a936b14a8accec034a2 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 19 Sep 2002 18:31:06 +0000 Subject: [PATCH] dont copy if the application types dont match and the source and dest are both not containers in smart copy --- src/gdd/gddAppTable.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gdd/gddAppTable.cc b/src/gdd/gddAppTable.cc index af7f7650d..ed9cc2f4a 100644 --- a/src/gdd/gddAppTable.cc +++ b/src/gdd/gddAppTable.cc @@ -546,8 +546,14 @@ gddStatus gddApplicationTypeTable::smartCopy(gdd* dest, const gdd* src) rc=copyDD_src(*dest,*src); else if(src->isContainer() && src->isManaged()) rc=copyDD_dest(*dest,*src); - else if(!src->isContainer() && !dest->isContainer()) - rc=dest->put(src); // both are not containers, let gdd handle it + else if(!src->isContainer() && !dest->isContainer()) { + if ( src->applicationType() == dest->applicationType() ) { + rc=dest->put(src); // both are not containers, let gdd handle it + } + else { + rc=gddErrorNotDefined; + } + } else rc=gddErrorNotAllowed;