Skip to content

Commit 87fff03

Browse files
author
alrossi
committed
gplazma2-xacml: fix regression on network address sort
module: gplazma2-xacml svn trunk@18137 altered NetworkUtils to use an immutable list for local addresses. The XACML plugin needs to sort these according to external/internal. This sort was failing and causing failure to load the plugin (undiscovered until now). Patch copies the immutable list and then sorts. Target: 2.6 Patch: http://rb.dcache.org/r/5539 Require-notes: no Require-book: no Acked-by: Paul
1 parent 107b80f commit 87fff03

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

modules/gplazma2-xacml/src/main/java/org/dcache/gplazma/plugins/XACMLPlugin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.security.cert.CRLException;
3030
import java.security.cert.CertificateException;
3131
import java.security.cert.X509Certificate;
32+
import java.util.ArrayList;
3233
import java.util.Collections;
3334
import java.util.LinkedHashSet;
3435
import java.util.List;
@@ -440,6 +441,8 @@ private void configureResourceDNSHostName() throws SocketException {
440441
return;
441442
}
442443

444+
addressList = new ArrayList<>(addressList);
445+
443446
Collections.sort(addressList, NetworkUtils.getExternalInternalSorter());
444447
_resourceDNSHostName = addressList.get(0).getCanonicalHostName();
445448
}

0 commit comments

Comments
 (0)