You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by mh...@apache.org on 2007/07/30 18:40:18 UTC
svn commit: r561033 - in /mina/trunk/core/src/main/java/org/apache/mina:
common/FileRegion.java common/SendFileRegion.java
common/support/DefaultSendFileRegion.java
transport/socket/nio/SocketIoProcessor.java
Author: mheath
Date: Mon Jul 30 09:40:14 2007
New Revision: 561033
URL: http://svn.apache.org/viewvc?view=rev&rev=561033
Log:
Renamed SendFileRegion to FileRegion and renamed FileRegion.getBytesWritten() to getWrittenBytes() per Trustins comments in DIRMINA-218.
Added:
mina/trunk/core/src/main/java/org/apache/mina/common/FileRegion.java
- copied, changed from r560631, mina/trunk/core/src/main/java/org/apache/mina/common/SendFileRegion.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/SendFileRegion.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultSendFileRegion.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/FileRegion.java (from r560631, mina/trunk/core/src/main/java/org/apache/mina/common/SendFileRegion.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/FileRegion.java?view=diff&rev=561033&p1=mina/trunk/core/src/main/java/org/apache/mina/common/SendFileRegion.java&r1=560631&p2=mina/trunk/core/src/main/java/org/apache/mina/common/FileRegion.java&r2=561033
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/SendFileRegion.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/FileRegion.java Mon Jul 30 09:40:14 2007
@@ -8,7 +8,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 560320 $, $Date: 2007-07-27 11:12:26 -0600 (Fri, 27 Jul 2007) $,
*/
-public interface SendFileRegion {
+public interface FileRegion {
/**
* The open <tt>FileChannel<tt> from which data will be read to send to remote host.
@@ -43,6 +43,6 @@
*
* @return The total number of bytes already written.
*/
- long getBytesWritten();
+ long getWrittenBytes();
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultSendFileRegion.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultSendFileRegion.java?view=diff&rev=561033&r1=561032&r2=561033
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultSendFileRegion.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultSendFileRegion.java Mon Jul 30 09:40:14 2007
@@ -2,9 +2,9 @@
import java.nio.channels.FileChannel;
-import org.apache.mina.common.SendFileRegion;
+import org.apache.mina.common.FileRegion;
-public class DefaultSendFileRegion implements SendFileRegion {
+public class DefaultSendFileRegion implements FileRegion {
private final FileChannel channel;
@@ -28,7 +28,7 @@
this.count = count;
}
- public long getBytesWritten() {
+ public long getWrittenBytes() {
return position - originalPosition;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?view=diff&rev=561033&r1=561032&r2=561033
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java Mon Jul 30 09:40:14 2007
@@ -35,7 +35,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.SendFileRegion;
+import org.apache.mina.common.FileRegion;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteTimeoutException;
import org.apache.mina.common.support.IoServiceListenerSupport;
@@ -384,8 +384,8 @@
}
Object message = req.getMessage();
- if (message instanceof SendFileRegion) {
- SendFileRegion region = (SendFileRegion) message;
+ if (message instanceof FileRegion) {
+ FileRegion region = (FileRegion) message;
if (region.getCount() <= 0) {
// File has been sent, remove from queue