You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2008/03/17 07:46:49 UTC
svn commit: r637743 - in
/mina/trunk/core/src/main/java/org/apache/mina/common:
AbstractIoSession.java DefaultWriteRequest.java IoSession.java
WriteRequestWrapper.java
Author: trustin
Date: Sun Mar 16 23:46:47 2008
New Revision: 637743
URL: http://svn.apache.org/viewvc?rev=637743&view=rev
Log:
Resolved issue: DIRMINA-526 - Expose getCurrentWriteRequest() via IoSession
* Added IoSession.getCurrentWriteMessage() and IoSession.getCurrentWriteRequest()
* Improved WriteRequest implementations' toString()
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteRequest.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/WriteRequestWrapper.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java?rev=637743&r1=637742&r2=637743&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java Sun Mar 16 23:46:47 2008
@@ -608,8 +608,16 @@
return writeRequestQueue;
}
- protected final WriteRequest getCurrentWriteRequest() {
+ public final WriteRequest getCurrentWriteRequest() {
return currentWriteRequest;
+ }
+
+ public final Object getCurrentWriteMessage() {
+ WriteRequest req = getCurrentWriteRequest();
+ if (req == null) {
+ return null;
+ }
+ return req.getMessage();
}
protected final void setCurrentWriteRequest(WriteRequest currentWriteRequest) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteRequest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteRequest.java?rev=637743&r1=637742&r2=637743&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteRequest.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteRequest.java Sun Mar 16 23:46:47 2008
@@ -156,6 +156,10 @@
@Override
public String toString() {
- return message.toString();
+ if (getDestination() == null) {
+ return message.toString();
+ } else {
+ return message.toString() + " => " + getDestination();
+ }
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java?rev=637743&r1=637742&r2=637743&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java Sun Mar 16 23:46:47 2008
@@ -424,6 +424,20 @@
* session.
*/
long getScheduledWriteBytes();
+
+ /**
+ * Returns the message which is being written by {@link IoService}.
+ * @return <tt>null</tt> if and if only no message is being written
+ */
+ Object getCurrentWriteMessage();
+
+ /**
+ * Returns the {@link WriteRequest} which is being processed by
+ * {@link IoService}.
+ *
+ * @return <tt>null</tt> if and if only no message is being written
+ */
+ WriteRequest getCurrentWriteRequest();
/**
* Returns the time in millis when this session is created.
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/WriteRequestWrapper.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/WriteRequestWrapper.java?rev=637743&r1=637742&r2=637743&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/WriteRequestWrapper.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/WriteRequestWrapper.java Sun Mar 16 23:46:47 2008
@@ -66,6 +66,10 @@
@Override
public String toString() {
- return getMessage().toString();
+ if (getDestination() == null) {
+ return getMessage().toString();
+ } else {
+ return getMessage().toString() + " => " + getDestination();
+ }
}
}