commit eea737beabebdf9d70eb42ca91675de6070ba7aa
author Edwin Kempin <ekempin@google.com> Mon Sep 26 10:29:11 2016 +0200
committer Edwin Kempin <ekempin@google.com> Mon Sep 26 10:35:19 2016 +0200
tree 9edd03ba8047cb261afda5723f3e1919bf2cd892
parent dc53b68d9d5f03afc77da4d3c51a20bdf0547bf9

Read project watches from ReviewDb

Change I9dc99f that migrates project watches from ReviewDb to git is
still pending, this means project watches still need to be read from
ReviewDb.

Bug: Issue 4631
Change-Id: I6db7a236e880f57267e590bf19a8e976201ff65c
Signed-off-by: Edwin Kempin <ekempin@google.com>

gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
index 63d2ddb..149931d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
@@ -174,7 +174,7 @@
       this.loader = loader;
       this.byName = byUsername;
       this.readFromGit =
-          cfg.getBoolean("user", null, "readProjectWatchesFromGit", true);
+          cfg.getBoolean("user", null, "readProjectWatchesFromGit", false);
       this.watchConfig = watchConfig;
     }
 

gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java
index 7cda472..3748e17 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java
@@ -60,7 +60,7 @@
     this.dbProvider = dbProvider;
     this.self = self;
     this.readFromGit =
-        cfg.getBoolean("user", null, "readProjectWatchesFromGit", true);
+        cfg.getBoolean("user", null, "readProjectWatchesFromGit", false);
     this.watchConfig = watchConfig;
   }