[HttpKernel] Removed useless else

This commit is contained in:
Pascal Borreli 2011-02-27 18:28:38 +01:00
parent fc42cc5066
commit 1fcb99b936
3 changed files with 32 additions and 34 deletions

View File

@ -456,7 +456,8 @@ class HttpCache implements HttpKernelInterface
// server the stale response while there is a revalidation // server the stale response while there is a revalidation
return true; return true;
} else { }
// wait for the lock to be released // wait for the lock to be released
$wait = 0; $wait = 0;
while (file_exists($lock) && $wait < 5000000) { while (file_exists($lock) && $wait < 5000000) {
@ -471,18 +472,15 @@ class HttpCache implements HttpKernelInterface
$entry->setStatusCode($new->getStatusCode()); $entry->setStatusCode($new->getStatusCode());
$entry->setProtocolVersion($new->getProtocolVersion()); $entry->setProtocolVersion($new->getProtocolVersion());
$entry->setCookies($new->getCookies()); $entry->setCookies($new->getCookies());
return true;
} else { } else {
// backend is slow as hell, send a 503 response (to avoid the dog pile effect) // backend is slow as hell, send a 503 response (to avoid the dog pile effect)
$entry->setStatusCode(503); $entry->setStatusCode(503);
$entry->setContent('503 Service Unavailable'); $entry->setContent('503 Service Unavailable');
$entry->headers->set('Retry-After', 10); $entry->headers->set('Retry-After', 10);
}
return true; return true;
} }
}
}
// we have the lock, call the backend // we have the lock, call the backend
return false; return false;

View File

@ -78,9 +78,9 @@ class Store implements StoreInterface
$this->locks[] = $path; $this->locks[] = $path;
return true; return true;
} else {
return $path;
} }
return $path;
} }
/** /**
@ -125,13 +125,13 @@ class Store implements StoreInterface
list($req, $headers) = $match; list($req, $headers) = $match;
if (file_exists($body = $this->getPath($headers['x-content-digest'][0]))) { if (file_exists($body = $this->getPath($headers['x-content-digest'][0]))) {
return $this->restoreResponse($headers, $body); return $this->restoreResponse($headers, $body);
} else { }
// TODO the metaStore referenced an entity that doesn't exist in // TODO the metaStore referenced an entity that doesn't exist in
// the entityStore. We definitely want to return nil but we should // the entityStore. We definitely want to return nil but we should
// also purge the entry from the meta-store when this is detected. // also purge the entry from the meta-store when this is detected.
return null; return null;
} }
}
/** /**
* Writes a cache entry to the store for the given Request and Response. * Writes a cache entry to the store for the given Request and Response.

View File

@ -73,9 +73,9 @@ class SqliteProfilerStorage implements ProfilerStorageInterface
$this->close($db); $this->close($db);
if (isset($data[0]['data'])) { if (isset($data[0]['data'])) {
return array($data[0]['data'], $data[0]['ip'], $data[0]['url'], $data[0]['time']); return array($data[0]['data'], $data[0]['ip'], $data[0]['url'], $data[0]['time']);
} else {
return false;
} }
return false;
} }
/** /**