Update of third party libraries
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/380f36a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/380f36a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/380f36a5 Branch: refs/heads/master Commit: 380f36a53613aa9365ff282feb08ed92271c3a04 Parents: 7cf0676 Author: ÐндÑей <[email protected]> Authored: Wed Jan 8 23:58:52 2014 +0600 Committer: ÐндÑей <[email protected]> Committed: Wed Jan 8 23:58:52 2014 +0600 ---------------------------------------------------------------------- src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java | 1 + src/org/waveprotocol/box/server/rpc/WebSocketClientRpcChannel.java | 2 +- src/org/waveprotocol/box/server/waveserver/Wave.java | 2 +- src/org/waveprotocol/wave/federation/xmpp/RemoteDisco.java | 2 +- src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/380f36a5/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java index 3d3a33a..edc78c1 100755 --- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java +++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java @@ -432,6 +432,7 @@ public class ServerRpcProvider { // Servlet where the socketio connection is served from. // TODO(akaplanov): add servlet when https://github.com/vjrj/Socket.IO-Java will updated to Jetty v9. + // Issue https://issues.apache.org/jira/browse/WAVE-405. // ServletHolder sioholder = addServlet("/socket.io/*", WaveSocketIOServlet.class ); // // TODO(zamfi): fix to let messages span frames. // sioholder.setInitParameter("bufferSize", "" + BUFFER_SIZE); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/380f36a5/src/org/waveprotocol/box/server/rpc/WebSocketClientRpcChannel.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/rpc/WebSocketClientRpcChannel.java b/src/org/waveprotocol/box/server/rpc/WebSocketClientRpcChannel.java index fc14cc9..272e205 100644 --- a/src/org/waveprotocol/box/server/rpc/WebSocketClientRpcChannel.java +++ b/src/org/waveprotocol/box/server/rpc/WebSocketClientRpcChannel.java @@ -147,7 +147,7 @@ public class WebSocketClientRpcChannel implements ClientRpcChannel { client.connect(clientChannel, uri, request).get(); } catch (Exception ex) { throw new IOException(ex); - } + } return client; } } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/380f36a5/src/org/waveprotocol/box/server/waveserver/Wave.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/waveserver/Wave.java b/src/org/waveprotocol/box/server/waveserver/Wave.java index 3654496..815f814 100644 --- a/src/org/waveprotocol/box/server/waveserver/Wave.java +++ b/src/org/waveprotocol/box/server/waveserver/Wave.java @@ -80,7 +80,7 @@ final class Wave implements Iterable<WaveletContainer> { this.waveId = waveId; this.lookedupWavelets = lookedupWavelets; this.notifiee = notifiee; - + this.localWavelets = CacheBuilder.newBuilder().build( new WaveletCreator<LocalWaveletContainer>(localFactory, waveDomain)); this.remoteWavelets = CacheBuilder.newBuilder().build( http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/380f36a5/src/org/waveprotocol/wave/federation/xmpp/RemoteDisco.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/federation/xmpp/RemoteDisco.java b/src/org/waveprotocol/wave/federation/xmpp/RemoteDisco.java index 4e5a0e1..1ea43c5 100644 --- a/src/org/waveprotocol/wave/federation/xmpp/RemoteDisco.java +++ b/src/org/waveprotocol/wave/federation/xmpp/RemoteDisco.java @@ -403,7 +403,7 @@ public class RemoteDisco { } // Set either the result JID or error state. - + try { if (jid != null) { this.remoteJid = jid; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/380f36a5/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java b/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java index 2d10211..79148f5 100644 --- a/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java +++ b/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java @@ -103,7 +103,7 @@ public class XmppDisco { } }); } - + /** * Set the manager instance for this class. Must be invoked before any other * methods are used.
