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/06/11 09:21:02 UTC
svn commit: r546033 - in
/mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio:
SocketSessionConfigImpl.java support/DatagramSessionConfigImpl.java
Author: trustin
Date: Mon Jun 11 00:21:01 2007
New Revision: 546033
URL: http://svn.apache.org/viewvc?view=rev&rev=546033
Log:
Fixed issue: DIRMINA-386 (SocketSessionConfigImpl: initialize() uses "localhost" to bind InetSocketAddress, should use IP instead)
* Made sure fall-back default values are used even if all tests fail.
Modified:
mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionConfigImpl.java
mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionConfigImpl.java
Modified: mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionConfigImpl.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionConfigImpl.java?view=diff&rev=546033&r1=546032&r2=546033
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionConfigImpl.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionConfigImpl.java Mon Jun 11 00:21:01 2007
@@ -84,13 +84,12 @@
try {
initializeDefaultSocketParameters(unconnectedSocket);
} catch (SocketException se) {
+ ExceptionMonitor.getInstance().exceptionCaught(se);
try {
unconnectedSocket.close();
} catch (IOException ioe) {
ExceptionMonitor.getInstance().exceptionCaught(ioe);
}
-
- throw new ExceptionInInitializerError(se);
}
}
Modified: mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionConfigImpl.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionConfigImpl.java?view=diff&rev=546033&r1=546032&r2=546033
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionConfigImpl.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionConfigImpl.java Mon Jun 11 00:21:01 2007
@@ -22,6 +22,7 @@
import java.net.DatagramSocket;
import java.net.SocketException;
+import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.support.BaseIoSessionConfig;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
@@ -36,11 +37,11 @@
private static boolean GET_TRAFFIC_CLASS_AVAILABLE = false;
private static boolean SET_TRAFFIC_CLASS_AVAILABLE = false;
- private static boolean DEFAULT_BROADCAST;
- private static boolean DEFAULT_REUSE_ADDRESS;
- private static int DEFAULT_RECEIVE_BUFFER_SIZE;
- private static int DEFAULT_SEND_BUFFER_SIZE;
- private static int DEFAULT_TRAFFIC_CLASS;
+ private static boolean DEFAULT_BROADCAST = false;
+ private static boolean DEFAULT_REUSE_ADDRESS = false;
+ private static int DEFAULT_RECEIVE_BUFFER_SIZE = 1024;
+ private static int DEFAULT_SEND_BUFFER_SIZE = 1024;
+ private static int DEFAULT_TRAFFIC_CLASS = 0;
static
{
@@ -93,7 +94,7 @@
DEFAULT_TRAFFIC_CLASS = 0;
}
} catch (SocketException e) {
- throw new ExceptionInInitializerError(e);
+ ExceptionMonitor.getInstance().exceptionCaught(e);
}
finally {
if( socket != null )