Skip to content

[stable10] Add check for empty result in storage memcache #28548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 2 commits into from
Aug 9, 2017
Merged

[stable10] Add check for empty result in storage memcache #28548

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e7ed3a
Add check for empty result in storage memcache
Jun 27, 2017
7dca926
Remove redundant empty check
Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add check for empty result in storage memcache
  • Loading branch information
Vincent Petry committed Aug 1, 2017
commit 8e7ed3a458eaa110ad9d38deb17e4e8b53397184
4 changes: 2 additions & 2 deletions lib/private/Files/Cache/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static function getStorageById($storageId) {
self::$localCache = new CappedMemoryCache();
}
$result = self::$localCache->get($storageId);
if ($result === null) {
if ($result === null || empty($result) || !isset($result['numeric_id'])) {
Copy link
Member

@jvillafanez jvillafanez Aug 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the empty($result)?

Copy link
Contributor Author

@PVince81 PVince81 Aug 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed now 7dca926

$result = self::getStorageByIdFromCache($storageId);
self::$localCache->set($storageId, $result);
}
Expand All @@ -134,7 +134,7 @@ private static function getDistributedCache() {
*/
private static function getStorageByIdFromCache($storageId) {
$result = self::getDistributedCache()->get($storageId);
if ($result === null) {
if ($result === null || empty($result) || !isset($result['numeric_id'])) {
$result = self::getStorageByIdFromDb($storageId);
self::getDistributedCache()->set(
$storageId, $result, self::$distributedCacheTTL
Expand Down