You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/07/11 23:45:37 UTC
cvs commit: incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/protocol BufferProtocol.java GSSAPIClientProtocol.java
djencks 2004/07/11 14:45:37
Modified: modules/network/src/java/org/apache/geronimo/network
SelectorManager.java
modules/network/src/java/org/apache/geronimo/network/protocol
BufferProtocol.java GSSAPIClientProtocol.java
Log:
remove ExecutorFactory per Dain's suggestion
Revision Changes Path
1.14 +5 -5 incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java
Index: SelectorManager.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SelectorManager.java 8 Jul 2004 22:07:54 -0000 1.13
+++ SelectorManager.java 11 Jul 2004 21:45:37 -0000 1.14
@@ -183,17 +183,17 @@
if (key.isReadable()) {
log.trace("-OP_READ " + key);
key.interestOps(key.interestOps() & (~SelectionKey.OP_READ));
- threadPool.getExecutor().execute(new Event(key, SelectionKey.OP_READ));
+ threadPool.execute(new Event(key, SelectionKey.OP_READ));
}
if (key.isWritable()) {
log.trace("-OP_WRITE " + key);
key.interestOps(key.interestOps() & (~SelectionKey.OP_WRITE));
- threadPool.getExecutor().execute(new Event(key, SelectionKey.OP_WRITE));
+ threadPool.execute(new Event(key, SelectionKey.OP_WRITE));
}
if (key.isAcceptable()) {
log.trace("-OP_ACCEPT " + key);
key.interestOps(key.interestOps() & (~SelectionKey.OP_ACCEPT));
- threadPool.getExecutor().execute(new Event(key, SelectionKey.OP_ACCEPT));
+ threadPool.execute(new Event(key, SelectionKey.OP_ACCEPT));
}
i.remove(); // Remove the key from the set of selected keys
@@ -267,7 +267,7 @@
infoFactory.addOperation("getSelector");
infoFactory.addOperation("register", new Class[] {SelectableChannel.class, int.class, SelectionEventListner.class});
-
+
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.6 +3 -3 incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/protocol/BufferProtocol.java
Index: BufferProtocol.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/protocol/BufferProtocol.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BufferProtocol.java 8 Jul 2004 22:07:54 -0000 1.5
+++ BufferProtocol.java 11 Jul 2004 21:45:37 -0000 1.6
@@ -56,7 +56,7 @@
log.trace("Starting");
running = true;
try {
- threadPool.getExecutor().execute(new Runnable() {
+ threadPool.execute(new Runnable() {
public void run() {
try {
while (running) {
@@ -70,7 +70,7 @@
}
}
});
- threadPool.getExecutor().execute(new Runnable() {
+ threadPool.execute(new Runnable() {
public void run() {
try {
while (running) {
1.7 +2 -2 incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/protocol/GSSAPIClientProtocol.java
Index: GSSAPIClientProtocol.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/protocol/GSSAPIClientProtocol.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GSSAPIClientProtocol.java 8 Jul 2004 22:07:54 -0000 1.6
+++ GSSAPIClientProtocol.java 11 Jul 2004 21:45:37 -0000 1.7
@@ -119,7 +119,7 @@
context.requestInteg(integrity);
context.requestCredDeleg(true);
- threadPool.getExecutor().execute(new Runnable() {
+ threadPool.execute(new Runnable() {
public void run() {
try {
byte[] token = new byte[0];