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 2007/11/21 07:28:24 UTC
svn commit: r596955 - in
/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr:
AprProtocol.java AprSocketAcceptor.java AprSocketConnector.java
Author: trustin
Date: Tue Nov 20 22:28:24 2007
New Revision: 596955
URL: http://svn.apache.org/viewvc?rev=596955&view=rev
Log:
Removed AprProtocol
Removed:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprProtocol.java
Modified:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java?rev=596955&r1=596954&r2=596955&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java Tue Nov 20 22:28:24 2007
@@ -80,8 +80,7 @@
protected Long bind(SocketAddress localAddress) throws Exception {
InetSocketAddress la = (InetSocketAddress) localAddress;
long handle = Socket.create(
- Socket.APR_INET, AprProtocol.TCP.type, AprProtocol.TCP.protocol,
- pool);
+ Socket.APR_INET, Socket.SOCK_STREAM, Socket.APR_PROTO_TCP, pool);
boolean success = false;
try {
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java?rev=596955&r1=596954&r2=596955&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java Tue Nov 20 22:28:24 2007
@@ -232,10 +232,7 @@
inetAddr = Address.info(sockAddr.getHostName(), Socket.APR_INET,
sockAddr.getPort(), 0, AprLibrary.getInstance().getRootPool());
- long clientSock = Socket.create(Socket.APR_INET,
- AprProtocol.TCP.type, AprProtocol.TCP.protocol,
- AprLibrary.getInstance().getRootPool());
-
+ long clientSock = 0;
// FIXME : error checking
int ret = Socket.connect(clientSock, inetAddr);