Skip to content
Snippets Groups Projects
Verified Commit 25e88de0 authored by Fredrik Roubert's avatar Fredrik Roubert
Browse files

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.
parent 44c3341b
No related branches found
No related tags found
1 merge request!6ITS#4501 Update code base to Java8.
...@@ -349,7 +349,7 @@ public class UnpackResults { ...@@ -349,7 +349,7 @@ public class UnpackResults {
if (bval == null) { if (bval == null) {
bval = new byte[0]; bval = new byte[0];
} }
if (Base64.isValidUTF8(bval, /*isUCS2Only=*/false)) { if (com.novell.ldap.util.Base64.isValidUTF8(bval, /*isUCS2Only=*/false)) {
svals = attrib.getStringValueArray(); svals = attrib.getStringValueArray();
if ("1.3.6.1.4.1.1466.115.121.1.41".equals( if ("1.3.6.1.4.1.1466.115.121.1.41".equals(
con.schema.getAttributeSchema(attrib.getName()).getSyntaxString())) { con.schema.getAttributeSchema(attrib.getName()).getSyntaxString())) {
...@@ -364,7 +364,7 @@ public class UnpackResults { ...@@ -364,7 +364,7 @@ public class UnpackResults {
byteVals = attrib.getByteValueArray(); byteVals = attrib.getByteValueArray();
svals = new String[byteVals.length]; svals = new String[byteVals.length];
for (int i=0,m=byteVals.length;i<m;i++) { 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]);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment