fix: reference to Base64 is ambiguous, both class java.util.Base64 in java.util and class helma.util.Base64 in helma.util match (Java 8)
This commit is contained in:
parent
948dc9a76b
commit
dd822d4e24
2 changed files with 11 additions and 11 deletions
|
@ -714,7 +714,7 @@ public final class ResponseTrans extends Writer implements Serializable {
|
|||
// if (contentType != null)
|
||||
// digest.update (contentType.getBytes());
|
||||
byte[] b = digest.digest(response);
|
||||
etag = "\"" + new String(Base64.encode(b)) + "\"";
|
||||
etag = "\"" + new String(helma.util.Base64.encode(b)) + "\"";
|
||||
// only set response to 304 not modified if no cookies were set
|
||||
if (reqtrans.hasETag(etag) && countCookies() == 0) {
|
||||
response = new byte[0];
|
||||
|
@ -891,7 +891,7 @@ public final class ResponseTrans extends Writer implements Serializable {
|
|||
// generation sensitive to changes in the app
|
||||
byte[] b = digest.digest(MD5Encoder.toBytes(app.getChecksum()));
|
||||
|
||||
setETag(new String(Base64.encode(b)));
|
||||
setETag(new String(helma.util.Base64.encode(b)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -510,7 +510,7 @@ public abstract class AbstractServletClient extends HttpServlet {
|
|||
checksum[i] = (byte) (n);
|
||||
n >>>= 8;
|
||||
}
|
||||
String etag = "\"" + new String(Base64.encode(checksum)) + "\"";
|
||||
String etag = "\"" + new String(helma.util.Base64.encode(checksum)) + "\"";
|
||||
res.setHeader("ETag", etag);
|
||||
String etagHeader = req.getHeader("If-None-Match");
|
||||
if (etagHeader != null) {
|
||||
|
|
Loading…
Add table
Reference in a new issue