From c8414bee52d5e2325a512d9f4125b4e94ffc8a01 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 19 Apr 2010 08:21:19 -0700 Subject: [PATCH] Check for lack of existence of an asset before logging an error. Fixes bug #11526 --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/AssetClipboard.pm | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index fe34d438e..b80c8d5af 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -9,6 +9,7 @@ - added #10945: Wiki - Top-level keyword list - fixed #11444: Strange spectre problem - fixed #10189: pbworkflow000000000007 Hanging + - fixed #11526: Wrong log error in file AssetClipboard.pm 7.9.2 - added: Workflow to extend recurring Calendar events 2 years from the diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm index 35943f19c..194a37808 100644 --- a/lib/WebGUI/AssetClipboard.pm +++ b/lib/WebGUI/AssetClipboard.pm @@ -98,9 +98,12 @@ sub duplicate { my $newAsset = $parent->addChild( $self->get, undef, $self->get("revisionDate"), { skipAutoCommitWorkflows => $options->{skipAutoCommitWorkflows} } ); - $self->session->log->error( - sprintf "Unable to add child %s (%s) to %s (%s)", $self->getTitle, $self->getId, $parent->getTitle, $parent->getId - ); + if (! $newAsset) { + $self->session->log->error( + sprintf "Unable to add child %s (%s) to %s (%s)", $self->getTitle, $self->getId, $parent->getTitle, $parent->getId + ); + return undef; + } # Duplicate metadata fields my $sth = $self->session->db->read( "select * from metaData_values where assetId = ?",