Commit Graph

2775 Commits

Author SHA1 Message Date
Norman Maurer
0d66a36a14 Merge branch 'master' of ssh://github.com/netty/netty 2012-02-28 16:53:28 +01:00
Norman Maurer
40771f6faf add empty line 2012-02-28 14:21:47 +01:00
Norman Maurer
19358ee246 Workaround for JDK NIO bug. See #203 2012-02-28 14:19:29 +01:00
Trustin Lee
2984f26f97 Decreased all selector timeout from 500 ms to 10 ms
See #204
2012-02-27 13:02:42 -08:00
Trustin Lee
4612568687 Fix #204 - Increate the granularity of connect timeout in NIO
* Changed the Selector timeout from 500 to 10 so that the timeout is checked every 10 milliseconds
2012-02-27 12:56:18 -08:00
Norman Maurer
b6700fbe58 Fix naming of class. Thanks Trustin for review 2012-02-27 20:46:40 +01:00
Norman Maurer
0beaa107b4 Fix assert usage. Thanks Trustin for review 2012-02-27 20:45:46 +01:00
Norman Maurer
2b9df060dd Add support to wrap primitives via ChannelBuffers.wrap*(..) easily. See
#167
2012-02-26 20:51:53 +01:00
Norman Maurer
03cb43140c Only log if loglevel is enabled. 2012-02-26 18:15:42 +01:00
Norman Maurer
d0a962422e Add back missing HttpTunnelingServlet. See #148 2012-02-26 18:14:05 +01:00
Norman Maurer
16fada5c23 Remove bogus constructor. See #173 2012-02-26 11:06:14 +01:00
Norman Maurer
5e43e879f2 Add OrderedDownstreamThreadPoolExecutor which can be used when using the
new feature of ExecutionHandler to also handle downstream events. This
is mainly useful for SEDA like stuff. See #173
2012-02-26 11:00:30 +01:00
Norman Maurer
cfe7b49594 Cleaner impl of AbstractNioChannelSink and AbstractOioChannelSink. See
#140 and #187
2012-02-25 17:11:14 +01:00
Norman Maurer
68066c5e4b Make sure that ChannelDownstreamHandler impl fire exception caughts
later via the io-worker. See #140 and #187
2012-02-25 16:05:41 +01:00
Norman Maurer
f2d1f1e8ad Also fix the exception handling if a ChannelHandler throws an Exception
based of if its a io thread or not. See #187 and #140
2012-02-25 15:54:33 +01:00
Norman Maurer
ef64e8c332 oio and nio transport now make sure that a upstream event get only
executed from an io thread. See #140 and #187
2012-02-25 15:12:58 +01:00
Norman Maurer
c4a437e16b Fix later sending of exceptionCaught events. See #187 and #140 2012-02-25 14:30:10 +01:00
Norman Maurer
04a6ff92af Add static helper methods to fire upstream events later. See #187 and
#140
2012-02-25 14:28:43 +01:00
Norman Maurer
301a17c029 Rename method to better reflect its usage and update some javadocs. See
#187 and #140
2012-02-25 14:19:11 +01:00
Norman Maurer
c2bc463d61 Optimize the handling of fireEventLater if the current thread is the
worker thread. See #187 and #140
2012-02-24 22:03:32 +01:00
Norman Maurer
5fdd2dea12 Make it possible to schedule upstream events to get fired later in the
io-thread. This is the first part of #140 and #187
2012-02-24 20:26:50 +01:00
norman
2304913341 Merge branch 'master' of github.com:netty/netty 2012-02-21 08:28:01 +01:00
norman
2e36932097 Merge branch 'master' into remove_duplication
Conflicts:
	transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java
	transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
2012-02-21 08:25:59 +01:00
Norman Maurer
aa3b3d4a5b Merge pull request #198 from boldt/code-cleaning
Organized imports.
2012-02-20 23:05:34 -08:00
Dennis Boldt
b3cc305578 Organized imports. 2012-02-21 03:06:26 +01:00
Trustin Lee
a715220556 Fix a compilation error with the SCTP module in Mac 2012-02-20 16:04:46 -08:00
Trustin Lee
97b4876c08 Fix build errors with m2e 2012-02-20 16:01:28 -08:00
Norman Maurer
7bf049b1d4 Merge pull request #197 from echarles/master
Fix compilation issue due to jdk bug in older jdk versions
2012-02-20 02:56:00 -08:00
Eric Charles
bb6d140220 Fix compilation issue due to jdk bug Inference fails for type variable return constraint, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954 2012-02-20 10:28:40 +01:00
Jestan Nirojan
6eabd343c4 SCTP association shutdown cleanup 2012-02-20 01:39:42 +05:30
Norman Maurer
eafd8343eb Remove some casting. See #186 2012-02-19 13:59:09 +01:00
Norman Maurer
c5582a14b8 Merge pull request #194 from jabley/patch-2
Fix checkstyle warning
2012-02-19 00:24:37 -08:00
Norman Maurer
ebc7ae8090 Merge pull request #193 from jabley/patch-1
Fix checkstyle warning
2012-02-19 00:23:29 -08:00
Jestan Nirojan
fe1d51f1d5 Merge pull request #185 from jestan/master
Merge SCTP Transport Testsuite with netty/master.
2012-02-19 00:03:41 -08:00
Jestan Nirojan
0bb1fe2656 Skipped SCTP Transport tests in the build (Java SCTP is only available for Linux and Solaris) 2012-02-19 13:30:24 +05:30
Jestan Nirojan
0148658bcc Merge branch 'master' of github.com:jestan/netty 2012-02-19 12:40:30 +05:30
Jestan Nirojan
7dbb8d2b8f fixed checkstyle build failures 2012-02-19 12:38:39 +05:30
Jestan Nirojan
20d7379c53 merge upstream master 2012-02-19 12:37:50 +05:30
James Abley
f3c1e143c1 Fix checkstyle warning 2012-02-18 23:22:52 +00:00
James Abley
6d8daabefe Fix checkstyle warning 2012-02-18 23:19:45 +00:00
Norman Maurer
5557137dc0 Fix checkstyle 2012-02-18 23:03:13 +01:00
Norman Maurer
812a9026b8 Start to refactor nio transport to share more code. See #186 2012-02-18 23:02:56 +01:00
Norman Maurer
65be9ebd44 Start to refactor oio transport to share more code. See #186 2012-02-17 20:33:18 +01:00
norman
479def20bd Check if logging level is enabled before log. See #192 2012-02-17 10:37:41 +01:00
Jestan Nirojan
6d7ab72479 Corrected protocol identifier in SCTP test cases 2012-02-17 02:00:38 +05:30
Jestan Nirojan
4b99c4f4f7 1)set the selector select timout values equals to tcp nio transport
2)removed unsupported sctp socket options from SctpChannelConfig classes
3)added testcases for sctp multi homing and multi streaming
2012-02-17 01:52:24 +05:30
Jestan Nirojan
97a38872f5 added separate bind method in client bootstrap, to support multi homing in sctp 2012-02-17 01:47:24 +05:30
norman
1b099acde0 Introduce a new interface that specify methods for ChannelConfig that
are used in the scope of NIO. This allows to share some code and make it
easier later to cast. See #186
2012-02-16 15:40:32 +01:00
norman
c46b083c1f Correctly decode URI in QueryStringDecoder. See #189 2012-02-15 08:30:22 +01:00
Norman Maurer
4636309597 Fix HttpSnoopClient. See #183 2012-02-12 12:36:04 +01:00