Skip to content

encode node path as UTF-8 in DigestCalculator #2400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmestwa-coder wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −2
Open

encode node path as UTF-8 in DigestCalculator #2400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/DigestCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.zookeeper.server;

import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.zip.CRC32;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.data.StatPersisted;
Expand All @@ -30,7 +31,7 @@ public class DigestCalculator {

// The hardcoded digest version, should bump up this version whenever
// we changed the digest method or fields.
private static final int DIGEST_VERSION = 2;
private static final int DIGEST_VERSION = 3;


/**
Expand Down Expand Up @@ -95,7 +96,7 @@ long calculateDigest(String path, byte[] data, StatPersisted stat) {
bb.putLong(stat.getEphemeralOwner());

CRC32 crc = new CRC32();
crc.update(path.getBytes());
crc.update(path.getBytes(StandardCharsets.UTF_8));
if (data != null) {
crc.update(data);
}
Expand Down