User: pkendall Date: 01/08/09 01:49:09 Modified: src/main/org/jbossmq/il/oil OILClientIL.java OILClientILService.java OILServerILService.java Log: no message Revision Changes Path 1.5 +4 -4 jbossmq/src/main/org/jbossmq/il/oil/OILClientIL.java Index: OILClientIL.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/il/oil/OILClientIL.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- OILClientIL.java 2001/08/09 01:18:27 1.4 +++ OILClientIL.java 2001/08/09 08:49:09 1.5 @@ -29,7 +29,7 @@ * @author Norbert Lataille ([EMAIL PROTECTED]) * @author Hiram Chirino ([EMAIL PROTECTED]) * - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ */ public class OILClientIL implements ClientIL, java.io.Serializable { @@ -53,9 +53,9 @@ checkSocket(); cat.debug("Writing request"); out.writeByte(m_receive); - out.writeInt(messages.length); - for(int i=0;i<messages.length;++i) - messages[i].writeExternal(out); + out.writeInt(messages.length); + for(int i=0;i<messages.length;++i) + messages[i].writeExternal(out); cat.debug("Waiting for awnser"); waitAnswer(); cat.debug("Done"); 1.6 +21 -21 jbossmq/src/main/org/jbossmq/il/oil/OILClientILService.java Index: OILClientILService.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/il/oil/OILClientILService.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- OILClientILService.java 2001/08/09 01:18:27 1.5 +++ OILClientILService.java 2001/08/09 08:49:09 1.6 @@ -30,7 +30,7 @@ * @author Norbert Lataille ([EMAIL PROTECTED]) * @author Hiram Chirino ([EMAIL PROTECTED]) * - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public class OILClientILService implements org.jbossmq.il.ClientILService, Runnable { //the client IL @@ -70,10 +70,10 @@ public void stop() throws java.lang.Exception { running = false; worker.interrupt(); - if(serverSocket != null) - serverSocket.close(); - if(socket != null) - socket.close(); + if(serverSocket != null) + serverSocket.close(); + if(socket != null) + socket.close(); } static org.apache.log4j.Category cat = org.apache.log4j.Category.getInstance(OILClientILService.class); @@ -107,10 +107,10 @@ socket = serverSocket.accept(); } catch (java.io.InterruptedIOException e) { } catch (IOException e){ - if(running) - connection.asynchFailure("Error accepting connection from server in OILClientILService.", e); - return; - } + if(running) + connection.asynchFailure("Error accepting connection from server in OILClientILService.", e); + return; + } if( !running ) return; } @@ -123,12 +123,12 @@ connection.asynchFailure("Could not initialize the OILClientIL Service.", e); return; } finally { - try{ - serverSocket.close(); - serverSocket = null; - }catch(IOException e){ - } - } + try{ + serverSocket.close(); + serverSocket = null; + }catch(IOException e){ + } + } while (running) { @@ -145,12 +145,12 @@ switch (code) { case m_receive: - int numReceives = in.readInt(); - org.jbossmq.ReceiveRequest [] messages = new org.jbossmq.ReceiveRequest[numReceives]; - for(int i=0;i<numReceives;++i){ - messages[i] = new ReceiveRequest(); - messages[i].readExternal(in); - } + int numReceives = in.readInt(); + org.jbossmq.ReceiveRequest [] messages = new org.jbossmq.ReceiveRequest[numReceives]; + for(int i=0;i<numReceives;++i){ + messages[i] = new ReceiveRequest(); + messages[i].readExternal(in); + } connection.asynchDeliver(messages); break; case m_deleteTemporaryDestination: 1.9 +6 -6 jbossmq/src/main/org/jbossmq/il/oil/OILServerILService.java Index: OILServerILService.java =================================================================== RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/il/oil/OILServerILService.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- OILServerILService.java 2001/08/09 01:18:27 1.8 +++ OILServerILService.java 2001/08/09 08:49:09 1.9 @@ -47,7 +47,7 @@ * manage the JVM IL. * * @author Hiram Chirino ([EMAIL PROTECTED]) - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ */ public class OILServerILService extends ServerILJMXService implements OILServerILServiceMBean, Runnable { @@ -198,11 +198,11 @@ { case m_setSpyDistributedConnection: connectionToken = (ConnectionToken)in.readObject(); - category.debug("The UILClientIL Connection is set up"); + category.debug("The OILClientIL Connection is set up"); break; case m_acknowledge: - AcknowledgementRequest ack = new AcknowledgementRequest(); - ack.readExternal(in); + AcknowledgementRequest ack = new AcknowledgementRequest(); + ack.readExternal(in); server.acknowledge(connectionToken, ack); break; case m_addMessage: @@ -246,8 +246,8 @@ server.subscribe(connectionToken, (Subscription)in.readObject()); break; case m_transact: - TransactionRequest trans = new TransactionRequest(); - trans.readExternal(in); + TransactionRequest trans = new TransactionRequest(); + trans.readExternal(in); server.transact(connectionToken, trans); break; case m_unsubscribe: _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development