From bce42bca47a903ddcf18a39fb8736e33c0180937 Mon Sep 17 00:00:00 2001
From: David Delikat <david-delikat@usa.net>
Date: Thu, 12 Jan 2012 00:20:41 +0000
Subject: [PATCH] ticket 12318: asset error causes asset manager to fail

---
 docs/changelog/7.x.x.txt           | 1 +
 lib/WebGUI/Content/AssetManager.pm | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index be720c151..d22cfa645 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.10.24
+ - fixed #12318: asset error causes asset manager to fail
  - fixed #12308: error message used scalar as reference
  - fixed #12256: Calendar Search doesn't show admin controls
  - fixed #12268: Point of sale form missing from cart screen.
diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index 1a1de24cd..6460ce662 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -309,6 +309,11 @@ sub www_ajaxGetManagerPage {
     for my $assetId ( @{ $p->getPageData } ) {
         my $asset       = WebGUI::Asset->newByDynamicClass( $session, $assetId );
         
+        unless( $asset ) {
+              $session->log->error('www_ajaxGetManagerPage: assetId="'.$assetId.'" failed in newByDynamicClass');
+              next;
+        }
+
         # Populate the required fields to fill in
         my %fields      = (
             assetId         => $asset->getId,