You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2009/04/27 13:25:17 UTC
svn commit: r768927 [2/2] - in /mina/trunk:
core/src/main/java/org/apache/mina/core/filterchain/
core/src/main/java/org/apache/mina/core/future/
core/src/main/java/org/apache/mina/core/polling/
core/src/main/java/org/apache/mina/core/service/ core/src/...
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java Mon Apr 27 11:25:15 2009
@@ -63,7 +63,7 @@
// Connect failed
session.close(true);
} finally {
- session.resumeRead();
+ session.resumeRead();
session.resumeWrite();
}
}
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/proxy/Socks5GSSAPITestServer.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/proxy/Socks5GSSAPITestServer.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/proxy/Socks5GSSAPITestServer.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/proxy/Socks5GSSAPITestServer.java Mon Apr 27 11:25:15 2009
@@ -163,7 +163,7 @@
// Send a token to the peer if one was generated by acceptSecContext
if (token != null) {
- logger.debug(" Sending Token[{}] = {}", token.length,
+ logger.debug(" Sending Token[{}] = {}", token.length,
ByteUtilities.asHex(token));
outStream.writeByte(authVersion);
outStream.writeByte(mtyp);
@@ -181,14 +181,14 @@
* If mutual authentication did not take place, then
* only the client was authenticated to the
* server. Otherwise, both client and server were
- * authenticated to each other.
+ * authenticated to each other.
*/
if (context.getMutualAuthState()) {
logger.debug("Mutual authentication took place !");
}
// We can now abort the process after a short time as auth is OK
- // and finally block will close session
+ // and finally block will close session
Thread.sleep(500);
} catch (Exception ex) {
//ex.printStackTrace();
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/StateMachineProxyBuilder.java Mon Apr 27 11:25:15 2009
@@ -182,10 +182,10 @@
* @return the proxy object.
*/
public Object create(Class<?>[] ifaces, StateMachine sm) {
- ClassLoader cl = defaultCl;
- if (cl == null) {
- cl = Thread.currentThread().getContextClassLoader();
- }
+ ClassLoader cl = defaultCl;
+ if (cl == null) {
+ cl = Thread.currentThread().getContextClassLoader();
+ }
InvocationHandler handler = new MethodInvocationHandler(sm,
contextLookup, interceptor, eventFactory,
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/IoSessionStateContextLookup.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/IoSessionStateContextLookup.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/IoSessionStateContextLookup.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/IoSessionStateContextLookup.java Mon Apr 27 11:25:15 2009
@@ -64,7 +64,7 @@
* @param contextFactory the {@link StateContextFactory}.
*/
public IoSessionStateContextLookup(StateContextFactory contextFactory) {
- this(contextFactory, DEFAULT_SESSION_ATTRIBUTE_NAME);
+ this(contextFactory, DEFAULT_SESSION_ATTRIBUTE_NAME);
}
/**
@@ -77,7 +77,7 @@
*/
public IoSessionStateContextLookup(StateContextFactory contextFactory, String sessionAttributeName) {
super(contextFactory);
- this.sessionAttributeName = sessionAttributeName;
+ this.sessionAttributeName = sessionAttributeName;
}
protected StateContext lookup(Object eventArg) {
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java Mon Apr 27 11:25:15 2009
@@ -80,7 +80,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
*/
private class SessionConfigImpl extends AbstractDatagramSessionConfig {
- /**
+ /**
* {@inheritDoc}
*/
public boolean isReuseAddress() {
@@ -91,27 +91,27 @@
}
}
- /**
+ /**
* {@inheritDoc}
*/
public void setReuseAddress(boolean on) {
Socket.optSet(getDescriptor(), Socket.APR_SO_REUSEADDR, on ? 1 : 0);
}
- /**
+ /**
* {@inheritDoc}
*/
public int getTrafficClass() {
return 0;
}
- /**
+ /**
* {@inheritDoc}
*/
public void setTrafficClass(int tc) {
}
- /**
+ /**
* {@inheritDoc}
*/
public int getSendBufferSize() {
@@ -122,14 +122,14 @@
}
}
- /**
+ /**
* {@inheritDoc}
*/
public void setSendBufferSize(int size) {
Socket.optSet(getDescriptor(), Socket.APR_SO_SNDBUF, size);
}
- /**
+ /**
* {@inheritDoc}
*/
public int getReceiveBufferSize() {
@@ -140,21 +140,21 @@
}
}
- /**
+ /**
* {@inheritDoc}
*/
public void setReceiveBufferSize(int size) {
Socket.optSet(getDescriptor(), Socket.APR_SO_RCVBUF, size);
}
- /**
+ /**
* {@inheritDoc}
*/
public boolean isBroadcast() {
return false;
}
- /**
+ /**
* {@inheritDoc}
*/
public void setBroadcast(boolean broadcast) {
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java Mon Apr 27 11:25:15 2009
@@ -138,13 +138,13 @@
*/
@Override
protected int select() throws Exception {
- return select(Integer.MAX_VALUE);
+ return select(Integer.MAX_VALUE);
}
/**
* {@inheritDoc}
*/
- @Override
+ @Override
protected int select(long timeout) throws Exception {
int rv = Poll.poll(pollset, 1000 * timeout, polledSockets, false);
if (rv <= 0) {
@@ -201,7 +201,7 @@
}
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
@@ -274,7 +274,7 @@
} finally {
ret = Socket.close(session.getDescriptor());
- // destroying the session because it won't be reused
+ // destroying the session because it won't be reused
// after this point
Socket.destroy(session.getDescriptor());
session.setDescriptor(0);
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java Mon Apr 27 11:25:15 2009
@@ -67,7 +67,7 @@
return library != null;
}
- // APR memory pool (package wide mother pool)
+ // APR memory pool (package wide mother pool)
private final long pool;
/**
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java Mon Apr 27 11:25:15 2009
@@ -39,10 +39,10 @@
*/
public abstract class AprSession extends AbstractIoSession {
- // good old socket descriptor
- private long descriptor;
+ // good old socket descriptor
+ private long descriptor;
- // the service handling this session
+ // the service handling this session
private final IoService service;
// the processor processing this session
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java Mon Apr 27 11:25:15 2009
@@ -41,8 +41,6 @@
* @version $Rev$, $Date$
*/
class AprSocketSession extends AprSession {
-
-
static final TransportMetadata METADATA =
new DefaultTransportMetadata(
"apr", "socket", false, true,
@@ -82,7 +80,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
*/
private class SessionConfigImpl extends AbstractSocketSessionConfig {
- /**
+ /**
* {@inheritDoc}
*/
public boolean isKeepAlive() {
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java Mon Apr 27 11:25:15 2009
@@ -133,8 +133,8 @@
@Override
protected IoFuture dispose0() throws Exception {
- // stop the idle checking task
- idleChecker.getNotifyingTask().cancel();
+ // stop the idle checking task
+ idleChecker.getNotifyingTask().cancel();
return null;
}
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java?rev=768927&r1=768926&r2=768927&view=diff
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java Mon Apr 27 11:25:15 2009
@@ -131,11 +131,11 @@
port.addEventListener(this);
service.getIdleStatusChecker0().addSession(this);
try {
- getService().getFilterChainBuilder().buildFilterChain(getFilterChain());
- serviceListeners.fireSessionCreated(this);
+ getService().getFilterChainBuilder().buildFilterChain(getFilterChain());
+ serviceListeners.fireSessionCreated(this);
} catch (Throwable e) {
- getFilterChain().fireExceptionCaught(e);
- processor.remove(this);
+ getFilterChain().fireExceptionCaught(e);
+ processor.remove(this);
}
}
@@ -181,7 +181,7 @@
int writtenBytes = buf.remaining();
try {
- outputStream.write(buf.array(), buf.position(), writtenBytes);
+ outputStream.write(buf.array(), buf.position(), writtenBytes);
buf.position(buf.position() + writtenBytes);
req.getFuture().setWritten();
} catch (IOException e) {