Index: chrome/common/extensions/docs/server2/instance_servlet.py |
diff --git a/chrome/common/extensions/docs/server2/instance_servlet.py b/chrome/common/extensions/docs/server2/instance_servlet.py |
index 9710de6fd3d3451b2fb9afa5a3a97ee8525c46ff..2846a92c2cb773402afca4b0f56e89f1d311865b 100644 |
--- a/chrome/common/extensions/docs/server2/instance_servlet.py |
+++ b/chrome/common/extensions/docs/server2/instance_servlet.py |
@@ -37,13 +37,18 @@ class _OfflineRenderServletDelegate(RenderServlet.Delegate): |
@memoize |
def CreateServerInstanceForChannel(self, channel): |
object_store_creator = ObjectStoreCreator(channel, start_empty=False) |
- branch = (self._delegate.CreateBranchUtility(object_store_creator) |
- .GetBranchForChannel(channel)) |
+ branch_utility = self._delegate.CreateBranchUtility(object_store_creator) |
+ branch = branch_utility.GetChannelInfo(channel).branch |
host_file_system = CachingFileSystem( |
OfflineFileSystem(self._delegate.CreateHostFileSystemForBranch(branch)), |
object_store_creator) |
app_samples_file_system = self._delegate.CreateAppSamplesFileSystem( |
object_store_creator) |
+ def create_file_system(version): |
+ return CachingFileSystem( |
+ OfflineFileSystem(self._delegate.CreateHostFileSystemForBranch( |
+ branch_utility.GetBranchNumberForVersion(version))), |
+ object_store_creator) |
compiled_host_fs_factory = CompiledFileSystem.Factory( |
host_file_system, |
object_store_creator) |
@@ -52,7 +57,9 @@ class _OfflineRenderServletDelegate(RenderServlet.Delegate): |
host_file_system, |
app_samples_file_system, |
'' if channel == 'stable' else '/%s' % channel, |
- compiled_host_fs_factory) |
+ compiled_host_fs_factory, |
+ branch_utility, |
+ create_file_system) |
class InstanceServlet(object): |
'''Servlet for running on normal AppEngine instances. |