Refactor static variable name to match convention

Alluxio · Dec 16, 2013 · 21fa09d · 21fa09d
1 parent 98d8ea1
commit 21fa09d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/tachyon/Dependency.java b/src/main/java/tachyon/Dependency.java
@@ -95,8 +95,8 @@ public synchronized String getCommand() {
 
   public String parseCommandPrefix() {
     String rtn = COMMAND_PREFIX;
-    for (String s : RecomputeVariables._recomputeVars.keySet()) {
-      rtn = rtn.replace("$" + s, RecomputeVariables._recomputeVars.get(s));
+    for (String s : RecomputeVariables.sRecomputeVars.keySet()) {
+      rtn = rtn.replace("$" + s, RecomputeVariables.sRecomputeVars.get(s));
     }
     return rtn;
   }

diff --git a/src/main/java/tachyon/RecomputeVariables.java b/src/main/java/tachyon/RecomputeVariables.java
@@ -19,5 +19,5 @@
 import java.util.Hashtable;
 
 public class RecomputeVariables {
-  public static Hashtable<String, String> _recomputeVars = new Hashtable<String, String>();
+  public static Hashtable<String, String> sRecomputeVars = new Hashtable<String, String>();
 }
diff --git a/src/main/java/tachyon/web/WebInterfaceGeneralServlet.java b/src/main/java/tachyon/web/WebInterfaceGeneralServlet.java
@@ -106,12 +106,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
   @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
-    RecomputeVariables._recomputeVars.clear();
+    RecomputeVariables.sRecomputeVars.clear();
     for (String key : (Set<String>) request.getParameterMap().keySet()) {
       if (key.startsWith("varName")) {
         String value = request.getParameter("varVal" + key.substring(7));
         if (value != null) {
-          RecomputeVariables._recomputeVars.put(request.getParameter(key), value);
+          RecomputeVariables.sRecomputeVars.put(request.getParameter(key), value);
         }
       }
     }
@@ -166,7 +166,7 @@ private void populateValues(HttpServletRequest request) throws IOException {
       request.setAttribute("diskFreeCapacity", "UNKNOWN");
     }
 
-    request.setAttribute("recomputeVariables", RecomputeVariables._recomputeVars);
+    request.setAttribute("recomputeVariables", RecomputeVariables.sRecomputeVars);
 
     List<ClientWorkerInfo> workerInfos = mMasterInfo.getWorkersInfo();
     for (int i = 0; i < workerInfos.size(); i ++) {

diff --git a/src/test/java/tachyon/DependencyTest.java b/src/test/java/tachyon/DependencyTest.java
@@ -38,13 +38,13 @@ public class DependencyTest {
   public final void before() throws IOException {
     mLocalTachyonCluster = new LocalTachyonCluster(10000);
     mLocalTachyonCluster.start();
-    RecomputeVariables._recomputeVars.put("master", mMasterValue);
-    RecomputeVariables._recomputeVars.put("port", mPortValue);
+    RecomputeVariables.sRecomputeVars.put("master", mMasterValue);
+    RecomputeVariables.sRecomputeVars.put("port", mPortValue);
   }
 
   @After
   public final void after() throws Exception {
-    RecomputeVariables._recomputeVars.clear();
+    RecomputeVariables.sRecomputeVars.clear();
     mLocalTachyonCluster.stop();
   }