oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bad interaction between WebGUI::Asset->new() and caching mechanism.

Browse source
This commit is contained in:
Drake 2006-09-26 04:08:16 +00:00
parent 1dd24dd6b7
commit 4f7a3bf490
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/WebGUI/Asset.pm
View file

@ -1388,10 +1388,12 @@ sub new {
my $session = shift;
my $assetId = shift;
my $className = shift;
unless (defined $assetId) {
$session->errorHandler->error("Asset constructor new() requires an assetId.");
return undef;
}
my $assetRevision = $session->stow->get("assetRevision");
my $revisionDate = shift || $assetRevision->{$assetId}{$session->scratch->get("versionTag")||'_'};
unless ($revisionDate) {
@ -1402,6 +1404,15 @@ sub new {
$session->stow->set("assetRevision",$assetRevision);
}
return undef unless ($revisionDate);
unless ($class ne 'WebGUI::Asset' or defined $className) {
($className) = $session->db->quickArray("select className from asset where assetId=?", [$assetId]);
unless ($className) {
$session->errorHandler->error("Couldn't instantiate asset: ".$assetId. ": couldn't find class name");
return undef;
}
}
if ($className) {
my $cmd = "use ".$className;
eval ($cmd);
@ -1411,6 +1422,7 @@ sub new {
}
$class = $className;
}
my $cache = WebGUI::Cache->new($session, ["asset",$assetId,$revisionDate]);
my $properties = $cache->get;
if (exists $properties->{assetId}) {