Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 00:02:06 +01:00
Code Issues Releases Wiki Activity

Handle NameNotFoundException in smack-resolver-javax

Browse source
This commit is contained in:
Florian Schmaus 2017-01-24 20:14:01 +01:00
parent 1bcb5a2d1a
commit 2ac0fc72ba
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java
View file

@ -20,6 +20,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import org.jivesoftware.smack.ConnectionConfiguration.DnssecMode; import org.jivesoftware.smack.ConnectionConfiguration.DnssecMode;
@ -29,6 +30,8 @@ import org.jivesoftware.smack.ConnectionConfiguration.DnssecMode;
*/ */
public abstract class DNSResolver { public abstract class DNSResolver {
protected static final Logger LOGGER = Logger.getLogger(DNSResolver.class.getName());
private final boolean supportsDnssec; private final boolean supportsDnssec;
protected DNSResolver(boolean supportsDnssec) { protected DNSResolver(boolean supportsDnssec) {

23
smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java
View file

@ -1,6 +1,6 @@
/** /**
* *
* Copyright 2013-2016 Florian Schmaus * Copyright 2013-2017 Florian Schmaus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -20,7 +20,9 @@ import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration; import javax.naming.NamingEnumeration;
import javax.naming.NamingException; import javax.naming.NamingException;
import javax.naming.directory.Attribute; import javax.naming.directory.Attribute;
@ -80,15 +82,26 @@ public class JavaxResolver extends DNSResolver implements SmackInitializer {
@Override @Override
protected List<SRVRecord> lookupSRVRecords0(String name, List<HostAddress> failedAddresses, DnssecMode dnssecMode) { protected List<SRVRecord> lookupSRVRecords0(String name, List<HostAddress> failedAddresses, DnssecMode dnssecMode) {
List<SRVRecord> res = new ArrayList<SRVRecord>(); List<SRVRecord> res = null;
Attribute srvAttribute;
try { try {
Attributes dnsLookup = dirContext.getAttributes(name, new String[] { "SRV" }); Attributes dnsLookup = dirContext.getAttributes(name, new String[] { "SRV" });
Attribute srvAttribute = dnsLookup.get("SRV"); srvAttribute = dnsLookup.get("SRV");
if (srvAttribute == null) if (srvAttribute == null)
return res; return null;
} catch (NameNotFoundException e) {
LOGGER.log(Level.FINEST, "No DNS SRV RR found for " + name, e);
return null;
} catch (NamingException e) {
LOGGER.log(Level.WARNING, "Exception while resolving DNS SRV RR for " + name, e);
return null;
}
try {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
NamingEnumeration<String> srvRecords = (NamingEnumeration<String>) srvAttribute.getAll(); NamingEnumeration<String> srvRecords = (NamingEnumeration<String>) srvAttribute.getAll();
res = new ArrayList<>();
while (srvRecords.hasMore()) { while (srvRecords.hasMore()) {
String srvRecordString = srvRecords.next(); String srvRecordString = srvRecords.next();
String[] srvRecordEntries = srvRecordString.split(" "); String[] srvRecordEntries = srvRecordString.split(" ");
@ -107,7 +120,7 @@ public class JavaxResolver extends DNSResolver implements SmackInitializer {
} }
} }
catch (NamingException e) { catch (NamingException e) {
throw new IllegalStateException(e); LOGGER.log(Level.SEVERE, "Exception while resolving DNS SRV RR for" + name, e);
} }
return res; return res;