From d5dd260f329c6f3e812b3ddf5ebeb03b520f5372 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 4 Mar 2010 08:55:10 -0800
Subject: [PATCH] More instanciator cleanup.

---
 lib/WebGUI/AssetCollateral/DataForm/Entry.pm | 2 +-
 lib/WebGUI/AssetHelper/ChangeUrl.pm          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/AssetCollateral/DataForm/Entry.pm b/lib/WebGUI/AssetCollateral/DataForm/Entry.pm
index eef122059..0c8b4ced9 100644
--- a/lib/WebGUI/AssetCollateral/DataForm/Entry.pm
+++ b/lib/WebGUI/AssetCollateral/DataForm/Entry.pm
@@ -275,7 +275,7 @@ sub new {
         }
         if (! $assetId{$id}) {
             $assetId{$id} = $properties->{assetId};
-            $asset{$id} = WebGUI::Asset::Wobject::DataForm->new($session, $properties->{assetId});
+            $asset{$id} = WebGUI::Asset::Wobject::DataForm->newById($session, $properties->{assetId});
         }
         $self->setFromHash($properties);
     }
diff --git a/lib/WebGUI/AssetHelper/ChangeUrl.pm b/lib/WebGUI/AssetHelper/ChangeUrl.pm
index 784edebf9..2a8c95137 100644
--- a/lib/WebGUI/AssetHelper/ChangeUrl.pm
+++ b/lib/WebGUI/AssetHelper/ChangeUrl.pm
@@ -116,8 +116,8 @@ sub www_changeUrlSave {
         $asset->update({url => $newUrl});
         my $rs = $session->db->read("select revisionDate from assetData where assetId=? and revisionDate<>?",[$asset->getId, $asset->get("revisionDate")]);
         while (my ($version) = $rs->array) {
-            my $old = WebGUI::Asset->new($session, $asset->getId, $asset->get("className"), $version);
-            $old->purgeRevision if defined $old;
+            my $old = eval { WebGUI::Asset->newById($session, $asset->getId, $version); };
+            $old->purgeRevision if ! Exception::Class->caught();
         }
     }