You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/05/25 14:19:17 UTC
svn commit: r659973 - in /labs/vysper/src/main/java/org/apache/vysper:
mina/XmppIoHandlerAdapter.java xmpp/addressing/EntityImpl.java
xmpp/server/AbstractSessionContext.java
Author: berndf
Date: Sun May 25 05:19:16 2008
New Revision: 659973
URL: http://svn.apache.org/viewvc?rev=659973&view=rev
Log:
[vysper] cleanup resource registry on close (LABS-127)
fix entity resource id parsing
Modified:
labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
Modified: labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java?rev=659973&r1=659972&r2=659973&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/mina/XmppIoHandlerAdapter.java Sun May 25 05:19:16 2008
@@ -98,7 +98,8 @@
}
public void sessionClosed(IoSession ioSession) throws Exception {
- // TODO implement
+ SessionContext sessionContext = extractSession(ioSession);
+ if(sessionContext != null) sessionContext.endSession();
System.err.println("*** session closed");
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java?rev=659973&r1=659972&r2=659973&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java Sun May 25 05:19:16 2008
@@ -51,7 +51,7 @@
if (entity.contains(CHAR_SLASH)) {
int indexOfSlash = entity.indexOf(CHAR_SLASH);
domain = entity.substring(0, indexOfSlash);
- resource = entity.substring(indexOfSlash);
+ resource = entity.substring(indexOfSlash+1);
resource = ResourcePrep.prepare(resource);
}
return new EntityImpl(node, domain, resource);
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java?rev=659973&r1=659972&r2=659973&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java Sun May 25 05:19:16 2008
@@ -94,8 +94,8 @@
public void endSession() {
StanzaWriter stanzaWriter = getResponseWriter();
stanzaWriter.close();
- sessionStateHolder.setState(SessionState.CLOSED);
- // TODO do cleanup, e.g. registered resources etc.
+ sessionStateHolder.setState(SessionState.CLOSED); // no more traffic going through
+ getServerRuntimeContext().getResourceRegistry().unbindSession(this);
// TODO close underlying transport (TCP socket)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org