You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/04/26 17:03:03 UTC
svn commit: r532769 -
/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
Author: robbinspg
Date: Thu Apr 26 08:03:03 2007
New Revision: 532769
URL: http://svn.apache.org/viewvc?view=rev&rev=532769
Log:
TUSCANY-1226 Apply Caroline Maynard's patch
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp?view=diff&rev=532769&r1=532768&r2=532769
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp Thu Apr 26 08:03:03 2007
@@ -44,6 +44,11 @@
void CopyHelper::transferitem(DataObjectPtr to, DataObjectPtr from, const Property& p)
{
+ if (from->isNull(p)) {
+ to->setNull(p);
+ return;
+ }
+
switch (p.getTypeEnum())
{
case Type::BooleanType:
@@ -425,6 +430,11 @@
}
else
{
+ if (dataObject->isNull(pl[i])) {
+ newob->setNull(pl[i]);
+ continue;
+ }
+
DataObjectPtr dob = dataObject->getDataObject(pl[i]);
if (pl[i].isReference())
{
@@ -470,6 +480,8 @@
void CopyHelper::findReferences(DataObjectPtr oldDO, DataObjectPtr newDO,
DataObjectPtr obj, DataObjectPtr newObj)
{
+ if (!obj) return;
+
if ( obj->getType().isSequencedType() )
{
Sequence* fromSequence = obj->getSequence();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org