From 25e88de0c19367cd25f7775db486d1a039c1ca18 Mon Sep 17 00:00:00 2001
From: Fredrik Roubert <fredrik@roubert.name>
Date: Sat, 18 Feb 2023 18:27:29 +0100
Subject: [PATCH] ITS#4501 Use full package name to disambiguate ambiguous
reference.
JDK 8 introduced java.util.Base64 which has the same class name as
com.novell.ldap.util.Base64 which this code calls.
---
src/com/octetstring/jdbcLdap/jndi/UnpackResults.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/com/octetstring/jdbcLdap/jndi/UnpackResults.java b/src/com/octetstring/jdbcLdap/jndi/UnpackResults.java
index c99e52c..64029c9 100644
--- a/src/com/octetstring/jdbcLdap/jndi/UnpackResults.java
+++ b/src/com/octetstring/jdbcLdap/jndi/UnpackResults.java
@@ -349,7 +349,7 @@ public class UnpackResults {
if (bval == null) {
bval = new byte[0];
}
- if (Base64.isValidUTF8(bval, /*isUCS2Only=*/false)) {
+ if (com.novell.ldap.util.Base64.isValidUTF8(bval, /*isUCS2Only=*/false)) {
svals = attrib.getStringValueArray();
if ("1.3.6.1.4.1.1466.115.121.1.41".equals(
con.schema.getAttributeSchema(attrib.getName()).getSyntaxString())) {
@@ -364,7 +364,7 @@ public class UnpackResults {
byteVals = attrib.getByteValueArray();
svals = new String[byteVals.length];
for (int i=0,m=byteVals.length;i<m;i++) {
- svals[i] = Base64.encode(byteVals[i]);
+ svals[i] = com.novell.ldap.util.Base64.encode(byteVals[i]);
}
}
--
GitLab