From 165be5b38956ebf15f15f4ebef8025f1192f0a7e Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Mon, 19 Apr 2010 18:39:49 -0500
Subject: [PATCH] remove eval{} from caching code

---
 lib/WebGUI/Asset.pm                           |  4 ++--
 lib/WebGUI/Asset/File.pm                      |  6 +++---
 lib/WebGUI/Asset/File/Image.pm                |  4 ++--
 lib/WebGUI/Asset/File/ZipArchive.pm           |  4 ++--
 lib/WebGUI/Asset/Post.pm                      |  2 +-
 lib/WebGUI/Asset/Shortcut.pm                  |  6 +++---
 lib/WebGUI/Asset/Snippet.pm                   |  4 ++--
 lib/WebGUI/Asset/Wobject/Article.pm           |  6 +++---
 lib/WebGUI/Asset/Wobject/Collaboration.pm     |  4 ++--
 lib/WebGUI/Asset/Wobject/Folder.pm            |  6 +++---
 lib/WebGUI/Asset/Wobject/Layout.pm            |  4 ++--
 lib/WebGUI/Asset/Wobject/Matrix.pm            |  8 ++++----
 lib/WebGUI/Asset/Wobject/MessageBoard.pm      |  6 +++---
 lib/WebGUI/Asset/Wobject/SyndicatedContent.pm |  6 +++---
 lib/WebGUI/Asset/Wobject/Thingy.pm            |  4 ++--
 lib/WebGUI/AssetLineage.pm                    |  2 +-
 lib/WebGUI/Group.pm                           |  8 ++++----
 lib/WebGUI/Operation/Cache.pm                 |  2 +-
 lib/WebGUI/Operation/Settings.pm              |  2 +-
 lib/WebGUI/Session/Scratch.pm                 | 12 ++++++------
 lib/WebGUI/Session/Var.pm                     | 12 ++++++------
 lib/WebGUI/User.pm                            |  6 +++---
 22 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 262e93a9f..937150049 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -350,7 +350,7 @@ around BUILDARGS => sub {
         }
     }
 
-    my $properties = eval{$session->cache->get("asset".$assetId.$revisionDate)};
+    my $properties = $session->cache->get("asset".$assetId.$revisionDate);
     unless (exists $properties->{assetId}) { # can we get it from cache?
         my $sql = "select * from asset";
         my $where = " where asset.assetId=?";
@@ -368,7 +368,7 @@ around BUILDARGS => sub {
             $session->errorHandler->error("Asset $assetId $className $revisionDate is missing properties. Consult your database tables for corruption. ");
             return undef;
         }
-        eval{ $session->cache->set("asset".$assetId.$revisionDate, $properties, 60*60*24) };
+        $session->cache->set("asset".$assetId.$revisionDate, $properties, 60*60*24);
     }
 
     if (defined $properties) {
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 85088f2b0..c4374b2bc 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -449,7 +449,7 @@ Extends the master method to clear the view cache.
 
 override purgeCache => sub {
 	my $self = shift;
-	eval{$self->session->cache->delete("view_".$self->getId)};
+	$self->session->cache->delete("view_".$self->getId);
 	super();
 };
 
@@ -584,7 +584,7 @@ Generate the view method for the Asset, and handle caching.
 sub view {
 	my $self = shift;
 	if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
-		my $out = eval{$self->session->cache->get($self->getViewCacheKey)};
+		my $out = $self->session->cache->get($self->getViewCacheKey);
 		return $out if $out;
 	}
 	my %var = %{$self->get};
@@ -594,7 +594,7 @@ sub view {
 	$var{fileSize} = formatBytes($self->get("assetSize"));
     my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
 	if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
-		eval{$self->session->cache->set($self->getViewCacheKey, $out, $self->get("cacheTimeout"))};
+		$self->session->cache->set($self->getViewCacheKey, $out, $self->get("cacheTimeout"));
 	}
     return $out;
 }
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 3e31ddef3..05900df9a 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -224,7 +224,7 @@ sub view {
     my $cache = $session->cache;
     my $cacheKey = $self->getWwwCacheKey('view');
     if (!$session->var->isAdminOn && $self->cacheTimeout > 10) {
-        my $out = eval { $cache->get( $cacheKey ) };
+        my $out = $cache->get( $cacheKey );
 		return $out if $out;
 	}
 	my %var = %{$self->get};
@@ -247,7 +247,7 @@ sub view {
     $var{parameters} .= sprintf("id=%s", $self->getId);
     my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
     if (!$session->var->isAdminOn && $self->cacheTimeout > 10) {
-        eval{ $cache->set( $cacheKey, $out, $self->get("cacheTimeout") ) };
+        $cache->set( $cacheKey, $out, $self->get("cacheTimeout") );
     }
     return $out;
 }
diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm
index c5b892836..431cf1080 100644
--- a/lib/WebGUI/Asset/File/ZipArchive.pm
+++ b/lib/WebGUI/Asset/File/ZipArchive.pm
@@ -186,7 +186,7 @@ sub view {
     my $cache = $self->session->cache;
     my $cacheKey = $self->getWwwCacheKey('view');
     if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
-        my $out = eval { $cache->get( $cacheKey ) };
+        my $out = $cache->get( $cacheKey );
 		return $out if $out;
 	}
 	my %var = %{$self->get};
@@ -209,7 +209,7 @@ sub view {
 	$var{noFileSpecified} = $i18n->get('noFileSpecified');
        	my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
     if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
-        eval{ $cache->set( $cacheKey, $out, $self->cacheTimeout) };
+        $cache->set( $cacheKey, $out, $self->cacheTimeout);
     }
     return $out;
 }
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 21afb2463..9cb885c08 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -1175,7 +1175,7 @@ Extend the base class to handle caching.
 
 override purgeCache => sub {
 	my $self = shift;
-	eval{$self->session->cache->delete("view_".$self->getThread->getId)} if ($self->getThread);
+	$self->session->cache->delete("view_".$self->getThread->getId) if ($self->getThread);
 	super();
 };
 
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index e793f8938..812f6d370 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -484,7 +484,7 @@ sub getOverrides {
 	my $cache   = $session->cache;
     my $u       = WebGUI::User->new($self->session, $self->discernUserId);
 
-	my $overridesRef = eval{$cache->get($self->_overridesCacheTag)};
+	my $overridesRef = $cache->get($self->_overridesCacheTag);
     ##If admin mode is not on, and the cache is valid, and not expired, and the user object was not updated,
     ##return the cached value.
     if ( ! $session->var->isAdminOn
@@ -532,7 +532,7 @@ sub getOverrides {
         }
     }
     $overrides{userLastUpdated} = $session->user->get('lastUpdated');
-    eval{$cache->set($self->_overridesCacheTag, \%overrides, 60*60)};
+    $cache->set($self->_overridesCacheTag, \%overrides, 60*60);
     $overridesRef = \%overrides;
 	return %{ $overridesRef };
 }
@@ -879,7 +879,7 @@ Delete any cached overrides.
 
 sub uncacheOverrides {
 	my $self = shift;
-	eval{$self->session->cache->delete($self->_overridesCacheTag)};
+	$self->session->cache->delete($self->_overridesCacheTag);
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm
index 3da563f43..8d4ca57b6 100644
--- a/lib/WebGUI/Asset/Snippet.pm
+++ b/lib/WebGUI/Asset/Snippet.pm
@@ -249,7 +249,7 @@ sub view {
         || ($versionTag && $versionTag->getId eq $self->tagId);
     my $cacheKey = $self->getWwwCacheKey('view', $calledAsWebMethod);
     unless ($noCache) {
-        my $out = eval { $session->cache->get( $cacheKey )};
+        my $out = $session->cache->get( $cacheKey );
 		return $out if $out;
 	}
 	my $output = $self->usePacked
@@ -262,7 +262,7 @@ sub view {
 	}
 	WebGUI::Macro::process($session,\$output);
     unless ($noCache) {
-        eval { $session->cache->set( $cacheKey, $output, $self->cacheTimeout) };
+        $session->cache->set( $cacheKey, $output, $self->cacheTimeout);
 	}
     return $output;
 }
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index c75bca557..355dfe652 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -290,7 +290,7 @@ See WebGUI::Asset::purgeCache() for details.
 
 override purgeCache => sub {
 	my $self = shift;
-	eval{$self->session->cache->delete("view_".$self->getId)};
+	$self->session->cache->delete("view_".$self->getId);
 	super();
 };
 
@@ -322,7 +322,7 @@ sub view {
     my $cache = $self->session->cache;
 	if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") &&
             !$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
-		my $out = eval{$cache->get($self->getViewCacheKey)};
+		my $out = $cache->get($self->getViewCacheKey);
 		return $out if $out;
 	}
 	my %var;
@@ -386,7 +386,7 @@ sub view {
        	my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
 	if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") &&
             !$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
-		eval{$cache->set($self->getViewCacheKey, $out, $self->cacheTimeout)};
+		$cache->set($self->getViewCacheKey, $out, $self->cacheTimeout);
 	}
        	return $out;
 }
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index b53992401..f6d48e4e5 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -1584,7 +1584,7 @@ sub view {
 	my $self = shift;
     my $cache = $self->session->cache;
 	if ($self->_visitorCacheOk) {
-		my $out = eval{$cache->get($self->_visitorCacheKey)};
+		my $out = $cache->get($self->_visitorCacheKey);
 		$self->session->errorHandler->debug("HIT") if $out;
 		return $out if $out;
 	}
@@ -1595,7 +1595,7 @@ sub view {
 	$self->prepareView unless ($self->{_viewTemplate});
     my $out = $self->processTemplate($self->getViewTemplateVars,undef,$self->{_viewTemplate});
 	if ($self->_visitorCacheOk) {
-		eval{$cache->set($self->_visitorCacheKey, $out, $self->visitorCacheTimeout)};
+		$cache->set($self->_visitorCacheKey, $out, $self->visitorCacheTimeout);
 	}
     return $out;
 }
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 575b1eefd..e176e9732 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -190,7 +190,7 @@ See WebGUI::Asset::purgeCache() for details.
 
 override purgeCache => sub {
 	my $self = shift;
-	eval{$self->session->cache->delete("view_".$self->getId)};
+	$self->session->cache->delete("view_".$self->getId);
 	super();
 };
 
@@ -209,7 +209,7 @@ sub view {
     # Use cached version for visitors
     my $cache = $self->session->cache;
 	if ($self->session->user->isVisitor) {
-		my $out = eval{$cache->get("view_".$self->getId)};
+		my $out = $cache->get("view_".$self->getId);
 		return $out if $out;
 	}
 
@@ -274,7 +274,7 @@ sub view {
 
     # Update the cache
 	if ($self->session->user->isVisitor) {
-		eval{$cache->set("view_".$self->getId, $out, $self->visitorCacheTimeout)};
+		$cache->set("view_".$self->getId, $out, $self->visitorCacheTimeout);
 	}
 
     return $out;
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 2e26e8710..87cf0ec5e 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -419,12 +419,12 @@ override www_view => sub {
         return $check if (defined $check);
         my $cacheKey = $self->getWwwCacheKey('view');
         my $cache = $session->cache;
-        my $out = eval{ $cache->get($cacheKey) };
+        my $out = $cache->get($cacheKey);
         unless ($out) {
             $self->prepareView;
             $session->stow->set("cacheFixOverride", 1);
             $out = $self->processStyle($self->view, { noHeadTags => 1 });
-            eval{ $cache->set($cacheKey, $out, 60) };
+            $cache->set($cacheKey, $out, 60);
             $session->stow->delete("cacheFixOverride");
         }
         # keep those ads rotating even though the output is cached
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index eaeacae0c..8907288c3 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -486,7 +486,7 @@ sub getListings {
         || ($versionTag && $versionTag->getId eq $self->tagId);
     my $cache = $session->cache;
     unless ($noCache) {
-        $listingsEncoded = eval{$cache->get("matrixListings_".$self->getId)};
+        $listingsEncoded = $cache->get("matrixListings_".$self->getId);
     }
 
     if ($listingsEncoded){
@@ -526,7 +526,7 @@ assetData.revisionDate
         }
 
         $listingsEncoded = JSON->new->encode($listings);
-        eval{$cache->set("matrixListings_".$self->getId, $listingsEncoded, $self->listingsCacheTimeout)};
+        $cache->set("matrixListings_".$self->getId, $listingsEncoded, $self->listingsCacheTimeout);
     }
     return $listings;
 }
@@ -647,7 +647,7 @@ sub view {
         || ($versionTag && $versionTag->getId eq $self->tagId);
     my $cache = $session->cache;
     unless ($noCache) {
-        $varStatisticsEncoded = eval{$cache->get("matrixStatistics_".$self->getId)};
+        $varStatisticsEncoded = $cache->get("matrixStatistics_".$self->getId);
     }
 
     if ($varStatisticsEncoded){
@@ -797,7 +797,7 @@ sub view {
         [$self->getId]);
 
         $varStatisticsEncoded = JSON->new->encode($varStatistics);
-        eval{$cache->set("matrixStatistics_".$self->getId, $varStatisticsEncoded, $self->statisticsCacheTimeout)};
+        $cache->set("matrixStatistics_".$self->getId, $varStatisticsEncoded, $self->statisticsCacheTimeout);
     }
 
     foreach my $statistic (keys %{$varStatistics}) {
diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
index b2db08a68..a7f188da8 100644
--- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
@@ -72,7 +72,7 @@ See WebGUI::Asset::purgeCache() for details.
 
 override purgeCache => sub {
 	my $self = shift;
-	eval{$self->session->cache->delete("view_".$self->getId)};
+	$self->session->cache->delete("view_".$self->getId);
 	super();
 };
 
@@ -88,7 +88,7 @@ sub view {
 	my $self = shift;
     my $cache = $self->session->cache;
 	if ($self->session->user->isVisitor) {
-		my $out = eval{$cache->get("view_".$self->getId)};
+		my $out = $cache->get("view_".$self->getId);
 		return $out if $out;
 	}
 	my %var;
@@ -153,7 +153,7 @@ sub view {
 
 	my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
 	if ($self->session->user->isVisitor) {
-		eval{$cache->set("view_".$self->getId, $out, $self->visitorCacheTimeout)};
+		$cache->set("view_".$self->getId, $out, $self->visitorCacheTimeout);
 	}
        	return $out;
 }
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index b7a2ba715..f552dceb4 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -319,7 +319,7 @@ See WebGUI::Asset::purgeCache() for details.
 
 override purgeCache => sub {
 	my $self = shift;
-    eval{$self->session->cache->delete("view_".$self->getId)};
+    $self->session->cache->delete("view_".$self->getId);
 	super();
 };
 
@@ -337,7 +337,7 @@ sub view {
 
 	# try the cached version
 	my $cache = $session->cache; 
-	my $out = eval{$cache->get("view_".$self->getId)};
+	my $out = $cache->get("view_".$self->getId);
 	return $out if ($out ne "" && !$session->var->isAdminOn);
     #return $out if $out;
 
@@ -345,7 +345,7 @@ sub view {
 	my $feed = $self->generateFeed;
 	$out = $self->processTemplate($self->getTemplateVariables($feed),undef,$self->{_viewTemplate});
 	if (!$session->var->isAdminOn && $self->cacheTimeout > 10) {
-		eval{$cache->set("view_".$self->getId, $out, $self->cacheTimeout)};
+		$cache->set("view_".$self->getId, $out, $self->cacheTimeout);
 	}
 	return $out;
 }
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 2ee798035..d6e09c4b2 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -2656,7 +2656,7 @@ sub www_export {
         push(@fieldLabels,@metaDataFields)
     }
  
-    $query = eval{$session->cache->get("query_".$thingId)};
+    $query = $session->cache->get("query_".$thingId);
     $sth = $session->db->read($query);
 
     ### Loop through the returned structure and put it through Text::CSV
@@ -3301,7 +3301,7 @@ sequenceNumber');
     }
 
     # store query in cache for thirty minutes
-    eval{$self->session->cache->set("query_".$thingId, $query, 30*60)};
+    $self->session->cache->set("query_".$thingId, $query, 30*60);
 
     $paginatePage = $self->session->form->param('pn') || 1;
     $currentUrl = $self->session->url->append($currentUrl, "orderBy=".$orderBy) if $orderBy;
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index 0507afddf..3ba41e5dc 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -152,7 +152,7 @@ sub cascadeLineage {
         [$newLineage, length($oldLineage) + 1, $oldLineage . '%']
     );
     if ($records > 20) {
-        eval{$self->session->cache->flush};
+        $self->session->cache->flush;
     }
     else {
         my $descendants = $self->session->db->read("SELECT assetId FROM asset WHERE lineage LIKE ?", [$newLineage . '%']);
diff --git a/lib/WebGUI/Group.pm b/lib/WebGUI/Group.pm
index 97ceb3c7f..d387d3673 100644
--- a/lib/WebGUI/Group.pm
+++ b/lib/WebGUI/Group.pm
@@ -126,7 +126,7 @@ not be added to any group.  Groups may not be added to themselves.
 sub addGroups {
 	my $self = shift;
 	my $groups = shift;
-	eval{$self->session->cache->delete($self->getId)};
+	$self->session->cache->delete($self->getId);
 	GROUP: foreach my $gid (@{$groups}) {
 		next if ($gid eq '1');
 		next if ($gid eq $self->getId);
@@ -233,7 +233,7 @@ sub clearCaches {
 	my $groups = $self->getAllGroupsFor();
     my $cache = $self->session->cache;
 	foreach my $group ( $self->getId, @{ $groups } ) {
-		eval{$cache->delete($group)};
+		$cache->delete($group);
 	}
     my $stow = $self->session->stow;
 	$stow->delete("groupObj");
@@ -562,7 +562,7 @@ sub getAllUsers {
 	my $loopCount = shift;
 	my $expireTime = 0;
 	my $cache = $self->session->cache;
-	my $value = eval{$cache->get($self->getId)};
+	my $value = $cache->get($self->getId);
 	return $value if defined $value;
 	my @users = ();
 	push @users,
@@ -587,7 +587,7 @@ sub getAllUsers {
 	}
 	my %users = map { $_ => 1 } @users;
 	@users = keys %users;
-	eval{$cache->set($self->getId, \@users, $self->groupCacheTimeout)};
+	$cache->set($self->getId, \@users, $self->groupCacheTimeout);
 	return \@users;
 }
 
diff --git a/lib/WebGUI/Operation/Cache.pm b/lib/WebGUI/Operation/Cache.pm
index 6715b894c..1f231d1e1 100644
--- a/lib/WebGUI/Operation/Cache.pm
+++ b/lib/WebGUI/Operation/Cache.pm
@@ -92,7 +92,7 @@ sub www_flushCache {
     return $session->privilege->adminOnly unless canView($session);
 
     # Flush the cache
-    eval{$session->cache->flush};
+    $session->cache->flush;
 
     return www_manageCache($session);
 }
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index e98b4712d..3961ff061 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -736,7 +736,7 @@ sub www_saveSettings {
         $session->db->write( 
             "UPDATE userProfileData SET showMessageOnLoginSeen=0"
         );
-        eval{$session->cache->flush};
+        $session->cache->flush;
     }
 
     return www_editSettings($session, { errors => \@errors, message => $i18n->get("editSettings done") });
diff --git a/lib/WebGUI/Session/Scratch.pm b/lib/WebGUI/Session/Scratch.pm
index b592b3eb7..6b9405394 100644
--- a/lib/WebGUI/Session/Scratch.pm
+++ b/lib/WebGUI/Session/Scratch.pm
@@ -65,7 +65,7 @@ sub delete {
 	my $value = delete $self->{_data}{$name};
     my $session = $self->session;
     my $id = $session->getId;
-    eval{$session->cache->set("sessionscratch_".$id, $self->{_data}, $session->setting->get('sessionTimeout'))};
+    $session->cache->set("sessionscratch_".$id, $self->{_data}, $session->setting->get('sessionTimeout'));
 	$session->db->write("delete from userSessionScratch where name=? and sessionId=?", [$name, $id]);
 	return $value;
 }
@@ -84,7 +84,7 @@ sub deleteAll {
 	delete $self->{_data};
     my $session = $self->session;
     my $id = $session->getId;
-    eval{$session->cache->delete("sessionscratch_".$id)};
+    $session->cache->delete("sessionscratch_".$id);
 	$session->db->write("delete from userSessionScratch where sessionId=?", [$id]);
 }
 
@@ -107,7 +107,7 @@ sub deleteName {
 	return undef unless ($name);	
 	delete $self->{_data}{$name};
     my $session = $self->session;
-    eval{$session->cache->flush};
+    $session->cache->flush;
 	$session->db->write("delete from userSessionScratch where name=?", [$name]);
 }
 
@@ -134,7 +134,7 @@ sub deleteNameByValue {
 	return undef unless ($name and defined $value);
 	delete $self->{_data}{$name} if ($self->{_data}{$name} eq $value);
     my $session = $self->session;
-    eval{$session->cache->flush};
+    $session->cache->flush;
 	$session->db->write("delete from userSessionScratch where name=? and value=?", [$name,$value]);
 }
 
@@ -198,7 +198,7 @@ The current session.
 
 sub new {
     my ($class, $session) = @_;
-    my $scratch = eval{$session->cache->get("sessionscratch_".$session->getId)};
+    my $scratch = $session->cache->get("sessionscratch_".$session->getId);
     unless (ref $scratch eq "HASH") {
 	    $scratch = $session->db->buildHashRef("select name,value from userSessionScratch where sessionId=?",[$session->getId], {noOrder => 1});
     }
@@ -253,7 +253,7 @@ sub set {
 	$self->{_data}{$name} = $value;
     my $session = $self->session;
     my $id = $session->getId;
-    eval{$session->cache->set("sessionscratch_".$id, $self->{_data}, $session->setting->get('sessionTimeout'))};
+    $session->cache->set("sessionscratch_".$id, $self->{_data}, $session->setting->get('sessionTimeout'));
 	$session->db->write("replace into userSessionScratch (sessionId, name, value) values (?,?,?)", [$id, $name, $value]);
 }
 
diff --git a/lib/WebGUI/Session/Var.pm b/lib/WebGUI/Session/Var.pm
index af98a61c0..73a058172 100644
--- a/lib/WebGUI/Session/Var.pm
+++ b/lib/WebGUI/Session/Var.pm
@@ -71,7 +71,7 @@ sub end {
     my $self = shift;
     my $session = $self->session;
     my $id = $self->getId;
-    eval{$session->cache->delete($id)};
+    $session->cache->delete($id);
     $session->scratch->deleteAll;
     $session->db->write("delete from userSession where sessionId=?",[$id]);
     delete $session->{_user};
@@ -176,7 +176,7 @@ sub new {
 		$self->start(1);
 	}
     else { ##existing session requested
-        $self->{_var} = eval{$session->cache->get($sessionId)};
+        $self->{_var} = $session->cache->get($sessionId);
         unless ($self->{_var}{sessionId} eq $sessionId) {
             $self->{_var} = $session->db->quickHashRef("select * from userSession where sessionId=?",[$sessionId]);
         }
@@ -202,7 +202,7 @@ sub new {
             }
             else {
                 $self->{_var}{nextCacheFlush} = $time + $session->config->get("hotSessionFlushToDb");
-                eval{$session->cache->set($sessionId, $self->{_var}, $timeout)};
+                $session->cache->set($sessionId, $self->{_var}, $timeout);
             }
 			$self->session->{_sessionId} = $self->{_var}{sessionId};
             return $self;
@@ -264,7 +264,7 @@ sub start {
 		userId       => $userId
 	};
     $self->session->{_sessionId} = $sessionId;
-    eval{$session->cache->set($sessionId, $self->{_var}, $timeout)};
+    $session->cache->set($sessionId, $self->{_var}, $timeout);
     delete $self->{_var}{nextCacheFlush};
 	$session->db->setRow("userSession","sessionId",$self->{_var},$sessionId);
 	$self->{_sessionId} = $sessionId;
@@ -283,7 +283,7 @@ sub switchAdminOff {
     my $self = shift;
     $self->{_var}{adminOn} = 0;
     my $session = $self->session;
-    eval{$session->cache->set($self->getId, $self->{_var}, $session->setting->get('sessionTimeout'))};
+    $session->cache->set($self->getId, $self->{_var}, $session->setting->get('sessionTimeout'));
     delete $self->{_var}{nextCacheFlush};
     $session->db->setRow("userSession","sessionId", $self->{_var});
 }
@@ -300,7 +300,7 @@ sub switchAdminOn {
     my $self = shift;
     $self->{_var}{adminOn} = 1;
     my $session = $self->session;
-    eval{$session->cache->set($self->getId, $self->{_var}, $session->setting->get('sessionTimeout'))};
+    $session->cache->set($self->getId, $self->{_var}, $session->setting->get('sessionTimeout'));
     delete $self->{_var}{nextCacheFlush};
     $self->session->db->setRow("userSession","sessionId", $self->{_var});
 }
diff --git a/lib/WebGUI/User.pm b/lib/WebGUI/User.pm
index 237e5188b..73c7b318c 100644
--- a/lib/WebGUI/User.pm
+++ b/lib/WebGUI/User.pm
@@ -282,7 +282,7 @@ sub cache {
     for my $k (qw(_userId _user _profile)) {
         $userData{$k} = $self->{$k};
     }
-    eval{$self->session->cache->set($self->userId, \%userData, 60*60*24)};
+    $self->session->cache->set($self->userId, \%userData, 60*60*24);
 }
 
 #-------------------------------------------------------------------
@@ -1058,7 +1058,7 @@ sub new {
     my $userId      = shift || 1;
     my $overrideId  = shift;
     $userId         = _create($session, $overrideId) if ($userId eq "new");
-    my $self        = eval{$session->cache->get($userId)} || {};
+    my $self        = $session->cache->get($userId) || {};
     bless $self, $class;
     $self->{_session} = $session;
     unless ($self->{_userId} && $self->{_user}{username}) {
@@ -1332,7 +1332,7 @@ Deletes this user object out of the cache.
 
 sub uncache {
 	my $self = shift;
-	eval{$self->session->cache->delete($self->userId)};
+	$self->session->cache->delete($self->userId);
 }
 
 #----------------------------------------------------------------------------