------------------------------------------------------------
revno: 12083
revision-id: squidadm@squid-cache.org-20120308014108-82p1gq7j2zee9kb4
parent: squid3@treenet.co.nz-20120307225400-1vm1fbck8onihxur
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Wed 2012-03-07 18:41:08 -0700
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20120308014108-\
#   82p1gq7j2zee9kb4
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: ab8fc97817a057de01acd33afc4a8b3a67967ce2
# timestamp: 2012-03-08 01:58:49 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20120307225400-\
#   1vm1fbck8onihxur
# 
# Begin patch
=== modified file 'src/store_dir.cc'
--- src/store_dir.cc	2012-03-07 02:32:24 +0000
+++ src/store_dir.cc	2012-03-08 01:41:08 +0000
@@ -791,8 +791,7 @@
         // have a dedicated storage for them (that would not purge them).
         // They are not managed [well] by any specific Store handled below.
         keepInLocalMemory = true;
-    } else
-    if (memStore) {
+    } else if (memStore) {
         memStore->considerKeeping(e);
         // leave keepInLocalMemory false; memStore maintains its own cache
     } else {