sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

While loop around sync waiting.

Browse Source
fix-message-formatting
Danny van Heumen 12 years ago
parent 2a0c92a40a
commit d95e70727d
3 changed files with 354 additions and 174 deletions
Show Stats Download Patch File Download Diff File

367
src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
Unescape View File

@ -131,9 +131,6 @@ public void connect(String host, int port, String password,
// Make sure we start with an empty joined-channel list.
this.joined.clear();
// A container for storing the exception if connecting fails.
final Exception[] exceptionContainer = new Exception[1];
this.irc = new IRCApiImpl(true);
// FIXME Currently, the secure connection is created by
// explicitly creating an SSLContext for 'SSL'. According
@ -144,9 +141,23 @@ public void connect(String host, int port, String password,
secureConnection));
synchronized (this.irc)
{
// register a server listener in order to catch server and
// cross-/multi-channel messages
this.irc.addListener(new ServerListener());
connectSynchronized();
}
}
/**
* Perform synchronized connect operation.
*
* @return returns true upon successful connection, false otherwise
* @throws Exception exception thrown when connect fails
*/
private void connectSynchronized() throws Exception
{
final Result<IIRCState, Exception> result =
new Result<IIRCState, Exception>();
synchronized (result)
{
// start connecting to the specified server ...
// TODO Catch IOException/SocketException in case of early failure
// in call to connect()
@ -156,52 +167,54 @@ public void connect(String host, int port, String password,
@Override
public void onSuccess(IIRCState state)
{
synchronized (IrcStack.this.irc)
synchronized (result)
{
LOGGER.trace("IRC connected successfully!");
IrcStack.this.connectionState = state;
IrcStack.this.irc.notifyAll();
result.setDone(state);
result.notifyAll();
}
}
@Override
public void onFailure(Exception e)
{
synchronized (IrcStack.this.irc)
synchronized (result)
{
LOGGER.trace("IRC connection FAILED! ("
+ e.getMessage() + ")");
exceptionContainer[0] = e;
IrcStack.this.connectionState = null;
IrcStack.this.irc.notifyAll();
result.setDone(e);
result.notifyAll();
}
}
});
try
{
// wait while the irc connection is being established ...
LOGGER.trace("Waiting for the connection to be established ...");
while (!result.isDone())
{
LOGGER
.trace("Waiting for the connection to be established ...");
result.wait();
}
this.connectionState = result.getValue();
// TODO Implement connection timeout and a way to recognize that
// the timeout occurred.
this.irc.wait();
if (this.connectionState != null
&& this.connectionState.isConnected())
{
// if connecting succeeded, set state to registered
this.provider
.setCurrentRegistrationState(RegistrationState.REGISTERED);
}
else
{
// if connecting failed, set state to unregistered and throw
// the exception if one exists
this.provider
.setCurrentRegistrationState(RegistrationState.UNREGISTERED);
if (exceptionContainer[0] != null)
{
// If an exception happens to be available that explains
// the connection problem, throw it.
throw exceptionContainer[0];
}
Exception e = result.getException();
if (e != null)
throw e;
}
}
catch (InterruptedException e)
@ -377,7 +390,9 @@ public void join(final ChatRoomIrcImpl chatroom, final String password)
throw new IllegalArgumentException("chatroom cannot be null");
if (password == null)
throw new IllegalArgumentException("password cannot be null");
if (this.joined.containsKey(chatroom.getIdentifier()) || chatroom.isPrivate())
if (this.joined.containsKey(chatroom.getIdentifier())
|| chatroom.isPrivate())
{
// If we already joined this particular chatroom or if it is a
// private chat room (i.e. message from one user to another), no
@ -386,145 +401,46 @@ public void join(final ChatRoomIrcImpl chatroom, final String password)
}
LOGGER.trace("Start joining channel " + chatroom.getIdentifier());
final Exception[] joinSignal = new Exception[1];
final Result<Object, Exception> joinSignal =
new Result<Object, Exception>();
synchronized (joinSignal)
{
try
{
LOGGER
.trace("Issue join channel command to IRC library and wait for join operation to complete (un)successfully.");
// TODO Refactor this ridiculous nesting of functions and
// classes.
this.irc.joinChannel(chatroom.getIdentifier(), password,
new Callback<IRCChannel>()
{
@Override
public void onSuccess(IRCChannel channel)
{
LOGGER
.trace("Started callback for successful join of channel '"
+ chatroom.getIdentifier() + "'.");
ChatRoomIrcImpl actualChatRoom = chatroom;
synchronized (joinSignal)
{
try
{
if (channel.getName().equals(
actualChatRoom.getIdentifier()) == false)
{
// If the channel name is not the
// original chat room name, then we have
// been forwarded.
actualChatRoom =
new ChatRoomIrcImpl(channel
.getName(),
IrcStack.this.provider);
MessageIrcImpl message =
new MessageIrcImpl(
"Forwarding to channel "
+ channel.getName(),
"text/plain", "UTF-8", null);
IrcStack.this.provider.getMUC()
.registerChatRoomInstance(
actualChatRoom);
chatroom
.fireMessageReceivedEvent(
message,
null,
new Date(),
MessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
}
IrcStack.this.joined.put(
actualChatRoom.getIdentifier(),
actualChatRoom);
IrcStack.this.irc
.addListener(new ChatRoomListener(
actualChatRoom));
IRCTopic topic = channel.getTopic();
actualChatRoom.updateSubject(topic
.getValue());
for (IRCUser user : channel.getUsers())
{
ChatRoomMemberRole role =
ChatRoomMemberRole.SILENT_MEMBER;
Set<IRCUserStatus> statuses =
channel.getStatusesForUser(user);
for (IRCUserStatus status : statuses)
{
role =
convertMemberMode(status
.getChanModeType()
.charValue());
}
if (IrcStack.this.getNick().equals(
user.getNick()))
{
actualChatRoom.prepUserRole(role);
}
else
{
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(
IrcStack.this.provider,
actualChatRoom, user
.getNick(), role);
actualChatRoom.addChatRoomMember(
member.getContactAddress(),
member);
}
}
}
finally
{
// In any case, issue the local user
// presence, since the irc library notified
// us of a successful join. We should wait
// as long as possible though. First we need
// to fill the list of chat room members and
// other chat room properties.
IrcStack.this.provider
.getMUC()
.fireLocalUserPresenceEvent(
actualChatRoom,
LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_JOINED,
null);
LOGGER
.trace("Finished successful join callback for channel '"
+ chatroom.getIdentifier()
+ "'. Waking up original thread.");
// Notify waiting threads of finished
// execution.
joinSignal.notifyAll();
}
}
}
LOGGER
.trace("Issue join channel command to IRC library and wait for join operation to complete (un)successfully.");
// TODO Refactor this ridiculous nesting of functions and
// classes.
this.irc.joinChannel(chatroom.getIdentifier(), password,
new Callback<IRCChannel>()
{
@Override
public void onFailure(Exception e)
@Override
public void onSuccess(IRCChannel channel)
{
LOGGER
.trace("Started callback for successful join of channel '"
+ chatroom.getIdentifier() + "'.");
ChatRoomIrcImpl actualChatRoom = chatroom;
synchronized (joinSignal)
{
LOGGER
.trace("Started callback for failed attempt to join channel '"
+ chatroom.getIdentifier() + "'.");
// TODO how should we communicate a failed attempt
// at joining the channel? (System messages don't
// seem to show if there is no actual chat room
// presence.)
synchronized (joinSignal)
try
{
try
if (channel.getName().equals(
actualChatRoom.getIdentifier()) == false)
{
joinSignal[0] = e;
// If the channel name is not the
// original chat room name, then we have
// been forwarded.
actualChatRoom =
new ChatRoomIrcImpl(channel.getName(),
IrcStack.this.provider);
MessageIrcImpl message =
new MessageIrcImpl(
"Failed to join channel "
+ chatroom.getIdentifier()
+ " (" + e.getMessage() + ")",
"text/plain", "UTF-8",
"Failed to join");
"Forwarding to channel "
+ channel.getName(),
"text/plain", "UTF-8", null);
IrcStack.this.provider.getMUC()
.registerChatRoomInstance(
actualChatRoom);
chatroom
.fireMessageReceivedEvent(
message,
@ -532,39 +448,142 @@ public void onFailure(Exception e)
new Date(),
MessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
}
finally
IrcStack.this.joined.put(
actualChatRoom.getIdentifier(),
actualChatRoom);
IrcStack.this.irc
.addListener(new ChatRoomListener(
actualChatRoom));
IRCTopic topic = channel.getTopic();
actualChatRoom.updateSubject(topic.getValue());
for (IRCUser user : channel.getUsers())
{
LOGGER
.trace("Finished callback for failed attempt to join channel '"
+ chatroom.getIdentifier()
+ "'. Waking up original thread.");
// Notify waiting threads of finished
// execution
joinSignal.notifyAll();
ChatRoomMemberRole role =
ChatRoomMemberRole.SILENT_MEMBER;
Set<IRCUserStatus> statuses =
channel.getStatusesForUser(user);
for (IRCUserStatus status : statuses)
{
role =
convertMemberMode(status
.getChanModeType().charValue());
}
if (IrcStack.this.getNick().equals(
user.getNick()))
{
actualChatRoom.prepUserRole(role);
}
else
{
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(
IrcStack.this.provider,
actualChatRoom, user.getNick(),
role);
actualChatRoom.addChatRoomMember(
member.getContactAddress(), member);
}
}
}
finally
{
// In any case, issue the local user
// presence, since the irc library notified
// us of a successful join. We should wait
// as long as possible though. First we need
// to fill the list of chat room members and
// other chat room properties.
IrcStack.this.provider
.getMUC()
.fireLocalUserPresenceEvent(
actualChatRoom,
LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_JOINED,
null);
LOGGER
.trace("Finished successful join callback for channel '"
+ chatroom.getIdentifier()
+ "'. Waking up original thread.");
// Notify waiting threads of finished
// execution.
joinSignal.setDone();
joinSignal.notifyAll();
}
}
});
// Wait until async channel join operation has finished.
joinSignal.wait();
}
@Override
public void onFailure(Exception e)
{
LOGGER
.trace("Started callback for failed attempt to join channel '"
+ chatroom.getIdentifier() + "'.");
// TODO how should we communicate a failed attempt
// at joining the channel? (System messages don't
// seem to show if there is no actual chat room
// presence.)
synchronized (joinSignal)
{
try
{
MessageIrcImpl message =
new MessageIrcImpl(
"Failed to join channel "
+ chatroom.getIdentifier() + " ("
+ e.getMessage() + ")",
"text/plain", "UTF-8", "Failed to join");
chatroom
.fireMessageReceivedEvent(
message,
null,
new Date(),
MessageReceivedEvent.SYSTEM_MESSAGE_RECEIVED);
}
finally
{
LOGGER
.trace("Finished callback for failed attempt to join channel '"
+ chatroom.getIdentifier()
+ "'. Waking up original thread.");
// Notify waiting threads of finished
// execution
joinSignal.setDone(e);
joinSignal.notifyAll();
}
}
}
});
try
{
while (!joinSignal.isDone())
{
LOGGER.trace("Waiting for channel join message ...");
// Wait until async channel join operation has finished.
joinSignal.wait();
}
LOGGER
.trace("Finished waiting for join operation for channel '"
+ chatroom.getIdentifier() + "' to complete.");
// TODO How to handle 480 (+j): Channel throttle exceeded?
Exception e = joinSignal.getException();
if (e != null)
{
// in case an exception occurred during join process
throw new OperationFailedException(e.getMessage(),
OperationFailedException.CHAT_ROOM_NOT_JOINED, e);
}
}
catch (InterruptedException e)
{
// TODO what should we do with this? Maybe store in joinSignal
// if there's nothing else?
e.printStackTrace();
}
if (joinSignal[0] != null)
{
// in case an exception occurred during join process
throw new OperationFailedException(joinSignal[0].getMessage(),
OperationFailedException.CHAT_ROOM_NOT_JOINED,
joinSignal[0]);
throw new OperationFailedException(e.getMessage(),
OperationFailedException.INTERNAL_ERROR, e);
}
}
}

105
src/net/java/sip/communicator/impl/protocol/irc/Result.java
Unescape View File

@ -0,0 +1,105 @@
package net.java.sip.communicator.impl.protocol.irc;
/**
* Small container class that can contain a result and/or an exception.
*
* The container can be used for synchronizing between threads and
* simultaneously provide a container for storing a result and/or an exception
* that occurred within the separate thread that should be passed on to the
* calling thread.
*
* @author Danny van Heumen
*
* @param <T> type of the value
* @param <E> type of the exception
*/
public class Result<T, E extends Exception>
{
/**
* Boolean flag done.
*/
private boolean done = false;
/**
* The result.
*/
private T value = null;
/**
* The (possible) exception
*/
private E exception = null;
/**
* Check whether it is actually done.
*
* @return return true when done or false otherwise
*/
public boolean isDone()
{
return this.done;
}
/**
* Set done without setting anything else.
*/
public void setDone()
{
this.done = true;
}
/**
* Set done and provide a result.
*
* @param value the result
*/
public void setDone(T value)
{
this.value = value;
this.setDone();
}
/**
* Set done and provide an exception.
*
* @param exception the exception
*/
public void setDone(E exception)
{
this.exception = exception;
this.setDone();
}
/**
* Set done and set both result and exception.
*
* @param value the value
* @param exception the exception
*/
public void setDone(T value, E exception)
{
this.value = value;
this.exception = exception;
this.setDone();
}
/**
* Get the value.
*
* @return return the value
*/
public T getValue()
{
return this.value;
}
/**
* Get the exception.
*
* @return return the exception
*/
public E getException()
{
return this.exception;
}
}

56
test/net/java/sip/communicator/impl/protocol/irc/ResultTest.java
Unescape View File

@ -0,0 +1,56 @@
package net.java.sip.communicator.impl.protocol.irc;
import junit.framework.*;
public class ResultTest
extends TestCase
{
public void testConstruction()
{
Result<Object, Exception> result = new Result<Object, Exception>();
Assert.assertNotNull(result);
Assert.assertFalse(result.isDone());
Assert.assertNull(result.getValue());
Assert.assertNull(result.getException());
}
public void testSetDone()
{
Result<Object, Exception> result = new Result<Object, Exception>();
result.setDone();
Assert.assertTrue(result.isDone());
Assert.assertNull(result.getValue());
Assert.assertNull(result.getException());
}
public void testSetDoneWithValue()
{
Object v = new Object();
Result<Object, Exception> result = new Result<Object, Exception>();
result.setDone(v);
Assert.assertTrue(result.isDone());
Assert.assertSame(v, result.getValue());
Assert.assertNull(result.getException());
}
public void testSetDoneWithException()
{
Exception e = new IllegalStateException("the world is going to explode");
Result<Object, Exception> result = new Result<Object, Exception>();
result.setDone(e);
Assert.assertTrue(result.isDone());
Assert.assertNull(result.getValue());
Assert.assertSame(e, result.getException());
}
public void testSetDoneWithBoth()
{
Object v = new Object();
Exception e = new IllegalStateException("the world is going to explode");
Result<Object, Exception> result = new Result<Object, Exception>();
result.setDone(v, e);
Assert.assertTrue(result.isDone());
Assert.assertSame(v, result.getValue());
Assert.assertSame(e, result.getException());
}
}
Write Preview
Loading…
Cancel
Save