vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 09:39:39 +02:00
Code Issues Releases Wiki Activity

Add errorprone check and fix found errors

Browse source 
Adds gradle-errorprone-plugin 0.0.8, requires Gradle 2.6.
This commit is contained in:
Florian Schmaus 2015-09-13 18:12:33 +02:00
parent 8096da43e0
commit d728204890
23 changed files with 64 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

9
smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
View file

@ -192,8 +192,13 @@ public final class SASLAuthentication {
else {
currentMechanism.authenticate(username, host, xmppServiceDomain, password);
}
// Wait until SASL negotiation finishes
wait(connection.getPacketReplyTimeout());
final long deadline = System.currentTimeMillis() + connection.getPacketReplyTimeout();
while (!authenticationSuccessful && saslException == null) {
final long now = System.currentTimeMillis();
if (now > deadline) break;
// Wait until SASL negotiation finishes
wait(deadline - now);
}
}
if (saslException != null){

11
smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java
View file

@ -71,7 +71,12 @@ class HTTPProxySocketConnection implements ProxySocketConnection {
while (true)
{
char c = (char) in.read();
int inByte = in.read();
if (inByte == -1)
{
throw new ProxyException(ProxyInfo.ProxyType.HTTP);
}
char c = (char) inByte;
got.append(c);
if (got.length() > 1024)
{
@ -79,10 +84,6 @@ class HTTPProxySocketConnection implements ProxySocketConnection {
"header of >1024 characters from "
+ proxyhost + ", cancelling connection");
}
if (c == -1)
{
throw new ProxyException(ProxyInfo.ProxyType.HTTP);
}
if ((nlchars == 0 || nlchars == 2) && c == '\r')
{
nlchars++;

2
smack-core/src/main/java/org/jivesoftware/smack/util/ObservableReader.java
View file

@ -31,7 +31,7 @@ import java.util.List;
public class ObservableReader extends Reader {
Reader wrappedReader = null;
List<ReaderListener> listeners = new ArrayList<ReaderListener>();
final List<ReaderListener> listeners = new ArrayList<ReaderListener>();
public ObservableReader(Reader wrappedReader) {
this.wrappedReader = wrappedReader;

2
smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java
View file

@ -31,7 +31,7 @@ public class ObservableWriter extends Writer {
private static final int MAX_STRING_BUILDER_SIZE = 4096;
Writer wrappedWriter = null;
List<WriterListener> listeners = new ArrayList<WriterListener>();
final List<WriterListener> listeners = new ArrayList<WriterListener>();
private final StringBuilder stringBuilder = new StringBuilder(MAX_STRING_BUILDER_SIZE);
public ObservableWriter(Writer wrappedWriter) {