User: user57
Date: 01/07/31 22:19:47
Modified: src/main/org/jbossmq/il/uil Tag: jboss_buildmagic
UILClientILService.java UILServerILService.java
Log:
o updated from HEAD
Revision Changes Path
No revision
No revision
1.2.2.1 +4 -8 jbossmq/src/main/org/jbossmq/il/uil/UILClientILService.java
Index: UILClientILService.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jbossmq/il/uil/UILClientILService.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- UILClientILService.java 2001/07/16 02:51:46 1.2
+++ UILClientILService.java 2001/08/01 05:19:47 1.2.2.1
@@ -108,15 +108,11 @@
while (running) {
try {
- cat.debug("Waiting for a request");
+ cat.debug("Waiting for a messgage from the server");
code = in.readByte();
- cat.debug("Got it");
-
+ } catch (java.io.InterruptedIOException e) {
+ continue;
} catch (IOException e) {
- if (running)
- break;
-
- connection.asynchFailure("Connection failure", e);
break;
}
1.3.2.2 +13 -11 jbossmq/src/main/org/jbossmq/il/uil/UILServerILService.java
Index: UILServerILService.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jbossmq/il/uil/UILServerILService.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- UILServerILService.java 2001/07/28 02:25:40 1.3.2.1
+++ UILServerILService.java 2001/08/01 05:19:47 1.3.2.2
@@ -38,6 +38,7 @@
import javax.jms.TemporaryQueue;
import org.jbossmq.TransactionRequest;
import java.io.IOException;
+import java.io.EOFException;
import org.jbossmq.SpyDestination;
/**
@@ -151,14 +152,18 @@
while( running && socket==null ) {
try {
- socket = serverSocket.accept();
+ socket = serverSocket.accept();
} catch ( java.io.InterruptedIOException e ) {
}
}
+
+ if( !running )
+ return;
+ socket.setSoTimeout(0);
new Thread(this,"UIL Worker").start();
- mSocket = new SocketMultiplexor(socket);
+ mSocket = new SocketMultiplexor(socket);
out = new ObjectOutputStream(new
BufferedOutputStream(mSocket.getOutputStream(1)));
out.flush();
@@ -171,18 +176,15 @@
return;
}
-
while (!closed && running) {
try {
-
- //socket.setSoTimeout(SO_TIMEOUT);
code=in.readByte();
-
- } catch ( java.io.InterruptedIOException e ) {
- if( !closed && !running )
- continue;
- } catch (IOException e) {
+ }
+ catch ( EOFException e ) {
+ break;
+ }
+ catch (IOException e) {
if( closed || !running )
break;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
