Merge 7231bc7 into d8c49b8

CorfuDB · Nov 14, 2017 · 8428895 · 8428895
2 parents d8c49b8 + 7231bc7
commit 8428895
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/infrastructure/src/main/java/org/corfudb/infrastructure/SequencerServer.java b/infrastructure/src/main/java/org/corfudb/infrastructure/SequencerServer.java
@@ -194,7 +194,7 @@ public SequencerServer(ServerContext serverContext) {
     * @param conflictParam The conflict parameter.
     * @return A conflict hash code.
     */
-    public String getConflictHashCode(UUID streamId, byte[] conflictParam) {
+    private String getConflictHashCode(UUID streamId, byte[] conflictParam) {
         return streamId.toString() + Utils.bytesToHex(conflictParam);
     }
 
@@ -212,7 +212,7 @@ public String getConflictHashCode(UUID streamId, byte[] conflictParam) {
      * @return Returns the type of token reponse based on whether the txn commits, or the abort
      *     cause.
      */
-    public TokenType txnCanCommit(TxResolutionInfo txInfo, /** Input. */
+    private TokenType txnCanCommit(TxResolutionInfo txInfo, /** Input. */
                                   AtomicReference<byte[]> conflictKey /** Output. */) {
         log.trace("Commit-req[{}]", txInfo);
         final long txSnapshotTimestamp = txInfo.getSnapshotTimestamp();
@@ -287,7 +287,7 @@ public TokenType txnCanCommit(TxResolutionInfo txInfo, /** Input. */
      * @param ctx netty ChannelHandlerContext
      * @param r   server router
      */
-    public void handleTokenQuery(CorfuPayloadMsg<TokenRequest> msg,
+    private void handleTokenQuery(CorfuPayloadMsg<TokenRequest> msg,
                                  ChannelHandlerContext ctx, IServerRouter r) {
         TokenRequest req = msg.getPayload();