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

Prevent NPE when closing trust store stream

Browse source
This commit is contained in:
Paul Schaub 2020-05-17 17:01:42 +02:00
parent f00acbff89
commit dc64a43f12
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
View file

@ -126,6 +126,7 @@ import org.jivesoftware.smack.sasl.SASLMechanism;
import org.jivesoftware.smack.sasl.core.SASLAnonymous; import org.jivesoftware.smack.sasl.core.SASLAnonymous;
import org.jivesoftware.smack.sasl.packet.SaslNonza; import org.jivesoftware.smack.sasl.packet.SaslNonza;
import org.jivesoftware.smack.util.Async; import org.jivesoftware.smack.util.Async;
import org.jivesoftware.smack.util.CloseableUtil;
import org.jivesoftware.smack.util.CollectionUtil; import org.jivesoftware.smack.util.CollectionUtil;
import org.jivesoftware.smack.util.Consumer; import org.jivesoftware.smack.util.Consumer;
import org.jivesoftware.smack.util.DNSUtil; import org.jivesoftware.smack.util.DNSUtil;
@ -2291,7 +2292,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
try { try {
ks.load(stream, password); ks.load(stream, password);
} finally { } finally {
stream.close(); CloseableUtil.maybeClose(stream);
} }
} catch (IOException e) { } catch (IOException e) {
LOGGER.log(Level.FINE, "KeyStore load() threw, attempting 'jks' fallback", e); LOGGER.log(Level.FINE, "KeyStore load() threw, attempting 'jks' fallback", e);
@ -2302,7 +2303,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
try { try {
ks.load(stream, null); ks.load(stream, null);
} finally { } finally {
stream.close(); CloseableUtil.maybeClose(stream);
} }
} }
} }