@@ -0,0 +1,873 @@
+package tachyon.client.next.file;%0A%0Aimport tachyon.client.next.ClientContext;%0Aimport tachyon.client.next.block.BlockMasterClientPool;%0Aimport tachyon.master.MasterClient;%0A%0A/**%0A * A shared context in each client JVM for common File System client functionality such as a pool%0A * of master clients.%0A */%0Apublic enum FSContext %7B%0A  INSTANCE;%0A%0A  // TODO: Separate this when block master and file system master use different clients%0A  private final BlockMasterClientPool mFileSystemMasterClientPool;%0A%0A  private FSContext() %7B%0A    mFileSystemMasterClientPool =%0A        new BlockMasterClientPool(ClientContext.getMasterAddress(), ClientContext.getConf());%0A  %7D%0A%0A  public MasterClient acquireMasterClient() %7B%0A    return mFileSystemMasterClientPool.acquire();%0A  %7D%0A%0A  public void releaseMasterClient(MasterClient masterClient) %7B%0A    mFileSystemMasterClientPool.release(masterClient);%0A  %7D%0A%7D%0A

Add FSContext.