projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IPA authentication working.
[lgpl/argeo-commons.git]
/
org.argeo.enterprise
/
src
/
org
/
argeo
/
naming
/
DnsBrowser.java
diff --git
a/org.argeo.enterprise/src/org/argeo/naming/DnsBrowser.java
b/org.argeo.enterprise/src/org/argeo/naming/DnsBrowser.java
index 7aadd64d80addb137efd1e9fc3025dcf8d88e1be..d9358c0830ee71f6130649e611a95f77eb3defae 100644
(file)
--- a/
org.argeo.enterprise/src/org/argeo/naming/DnsBrowser.java
+++ b/
org.argeo.enterprise/src/org/argeo/naming/DnsBrowser.java
@@
-21,12
+21,7
@@
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public class DnsBrowser implements Closeable {
public class DnsBrowser implements Closeable {
- private final static Log log = LogFactory.getLog(DnsBrowser.class);
-
private final DirContext initialCtx;
public DnsBrowser() throws NamingException {
private final DirContext initialCtx;
public DnsBrowser() throws NamingException {
@@
-84,7
+79,7
@@
public class DnsBrowser implements Closeable {
}
/** Ordered, with preferred first. */
}
/** Ordered, with preferred first. */
- public List<String> getSrvRecordsAsHosts(String name) throws NamingException {
+ public List<String> getSrvRecordsAsHosts(String name
, boolean withPort
) throws NamingException {
List<String> raw = getRecords(name, "SRV");
if (raw.size() == 0)
return null;
List<String> raw = getRecords(name, "SRV");
if (raw.size() == 0)
return null;
@@
-101,7
+96,7
@@
public class DnsBrowser implements Closeable {
}
List<String> lst = new ArrayList<>();
for (SrvRecord order : res) {
}
List<String> lst = new ArrayList<>();
for (SrvRecord order : res) {
- lst.add(order.toHost());
+ lst.add(order.toHost(
withPort
));
}
return Collections.unmodifiableList(lst);
}
}
return Collections.unmodifiableList(lst);
}
@@
-140,7
+135,7
@@
public class DnsBrowser implements Closeable {
try {
initialCtx.close();
} catch (NamingException e) {
try {
initialCtx.close();
} catch (NamingException e) {
- log.error("Cannot close context", e);
+ // silent
}
}
}
}