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

Make SmackException abstract

Browse source
This commit is contained in:
Florian Schmaus 2019-02-10 21:53:31 +01:00
parent 7e76712c46
commit 394f3d133a
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
View file

@ -29,12 +29,12 @@ import org.jxmpp.jid.Jid;
* *
* @author Florian Schmaus * @author Florian Schmaus
*/ */
public class SmackException extends Exception { public abstract class SmackException extends Exception {
/** /**
* *
*/ */
private static final long serialVersionUID = 1844674365368214457L; private static final long serialVersionUID = 1844674365368214458L;
/** /**
* Creates a new SmackException with the Throwable that was the root cause of the exception. * Creates a new SmackException with the Throwable that was the root cause of the exception.
@ -49,7 +49,7 @@ public class SmackException extends Exception {
super(message); super(message);
} }
public SmackException(String message, Throwable wrappedThrowable) { protected SmackException(String message, Throwable wrappedThrowable) {
super(message, wrappedThrowable); super(message, wrappedThrowable);
} }

4
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java
View file

@ -198,10 +198,10 @@ public class IncomingFileTransfer extends FileTransfer {
if (cause instanceof SmackException) { if (cause instanceof SmackException) {
throw (SmackException) cause; throw (SmackException) cause;
} }
throw new SmackException("Error in execution", e); throw new SmackException.SmackWrappedException("Error in execution", e);
} }
catch (TimeoutException e) { catch (TimeoutException e) {
throw new SmackException("Request timed out", e); throw new SmackException.SmackWrappedException("Request timed out", e);
} }
finally { finally {
streamNegotiatorTask.cancel(true); streamNegotiatorTask.cancel(true);

6
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
View file

@ -56,10 +56,10 @@ public class Socks5TransferNegotiator extends StreamNegotiator {
return this.manager.establishSession(target, streamID).getOutputStream(); return this.manager.establishSession(target, streamID).getOutputStream();
} }
catch (IOException e) { catch (IOException e) {
throw new SmackException("error establishing SOCKS5 Bytestream", e); throw new SmackException.SmackWrappedException("error establishing SOCKS5 Bytestream", e);
} }
catch (InterruptedException e) { catch (InterruptedException e) {
throw new SmackException("error establishing SOCKS5 Bytestream", e); throw new SmackException.SmackWrappedException("error establishing SOCKS5 Bytestream", e);
} }
} }
@ -109,7 +109,7 @@ public class Socks5TransferNegotiator extends StreamNegotiator {
return stream; return stream;
} }
catch (IOException e) { catch (IOException e) {
throw new SmackException("Error establishing input stream", e); throw new SmackException.SmackWrappedException("Error establishing input stream", e);
} }
} }