Menu
▾
▴
openjms-cvs — List for OpenJMS CVS commits
You can subscribe to this list here.
| 2003 |
Jan
(37) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <tan...@us...> - 2003-01-22 23:46:28
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/client
In directory sc8-pr-cvs1:/tmp/cvs-serv7672/src/main/org/exolab/jms/client
Modified Files:
JmsMessageProducer.java
Log Message:
added isClosed()
Index: JmsMessageProducer.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/JmsMessageProducer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JmsMessageProducer.java 14 Jan 2003 12:50:21 -0000 1.10
--- JmsMessageProducer.java 22 Jan 2003 23:46:25 -0000 1.11
***************
*** 209,215 ****
// implementation of MessageProducer.close
! public void close()
! throws JMSException
! {
_session = null;
}
--- 209,213 ----
// implementation of MessageProducer.close
! public synchronized void close() throws JMSException {
_session = null;
}
***************
*** 226,229 ****
--- 224,236 ----
}
+ /**
+ * Determines if the producer is closed
+ *
+ * @return <code>true</code> if the producer is closed
+ */
+ public synchronized boolean isClosed() {
+ return (_session != null);
+ }
+
/**
* Send the following message to the server. If we are in a trnasacted
***************
*** 262,264 ****
--- 269,272 ----
return LoggerFactory.getLogger();
}
+
}
|
|
From: <tan...@us...> - 2003-01-22 23:45:28
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/client
In directory sc8-pr-cvs1:/tmp/cvs-serv7406/src/main/org/exolab/jms/client
Modified Files:
JmsMessageConsumer.java
Log Message:
added isClosed()
Index: JmsMessageConsumer.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/JmsMessageConsumer.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** JmsMessageConsumer.java 13 Jan 2003 11:44:12 -0000 1.28
--- JmsMessageConsumer.java 22 Jan 2003 23:45:25 -0000 1.29
***************
*** 421,424 ****
--- 421,433 ----
/**
+ * Determines if the consumer is closed
+ *
+ * @return <code>true</code> if the consumer is closed
+ */
+ public boolean isClosed() {
+ return _closed;
+ }
+
+ /**
* Return a reference to the logger.
*
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc
In directory sc8-pr-cvs1:/tmp/cvs-serv5826
Modified Files:
IpcJmsServer.java IpcJmsSessionConnection.java
IpcJmsSessionList.java IpcJmsSessionSender.java
Log Message:
Fixes for asynch message handling. Previously, if more than one javax.jms.Connection was opened on a multiplex connection, the subsequent closure of one of them (or its sessions) would cause the 'message' channel to close as well.
Index: IpcJmsServer.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc/IpcJmsServer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IpcJmsServer.java 13 Jan 2003 13:44:08 -0000 1.12
--- IpcJmsServer.java 22 Jan 2003 23:39:54 -0000 1.13
***************
*** 173,180 ****
throws IOException {
IpcJmsSessionList list =
! (IpcJmsSessionList) _consumerList.get(session.getClientId());
if (list == null) {
list = new IpcJmsSessionList(connection);
! _consumerList.put(session.getClientId(), list);
}
list.add(session);
--- 173,180 ----
throws IOException {
IpcJmsSessionList list =
! (IpcJmsSessionList) _consumerList.get(connection);
if (list == null) {
list = new IpcJmsSessionList(connection);
! _consumerList.put(connection, list);
}
list.add(session);
***************
*** 185,195 ****
*
* @param session the session
*/
! synchronized public void removeConnection(JmsServerSession session) {
! IpcJmsSessionList list = (IpcJmsSessionList)_consumerList.get
! (session.getClientId());
if (list != null) {
if (list.remove(session)) {
! _consumerList.remove(session.getClientId());
}
}
--- 185,197 ----
*
* @param session the session
+ * @param connection the connection to the client
*/
! public synchronized void removeConnection(
! JmsServerSession session, MultiplexConnectionIfc connection) {
! IpcJmsSessionList list = (IpcJmsSessionList) _consumerList.get(
! connection);
if (list != null) {
if (list.remove(session)) {
! _consumerList.remove(connection);
}
}
Index: IpcJmsSessionConnection.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc/IpcJmsSessionConnection.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** IpcJmsSessionConnection.java 18 Jan 2003 01:58:40 -0000 1.18
--- IpcJmsSessionConnection.java 22 Jan 2003 23:39:55 -0000 1.19
***************
*** 39,43 ****
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 2000 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
--- 39,43 ----
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 2000-2003 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
***************
*** 117,121 ****
Serializable result = null;
if (func.equals("close")) {
! result = close(getSession(id, v));
} else if (func.equals("acknowledgeMessage")) {
result = acknowledgeMessage(getSession(id, v), (Long)v.get(5),
--- 117,121 ----
Serializable result = null;
if (func.equals("close")) {
! result = close(getSession(id, v), getConnection(id));
} else if (func.equals("acknowledgeMessage")) {
result = acknowledgeMessage(getSession(id, v), (Long)v.get(5),
***************
*** 264,271 ****
*
*/
! protected Vector close(JmsServerSession session) {
if (session != null) {
try {
! IpcJmsServer.instance().removeConnection(session);
session.close();
} catch (JMSException err) {
--- 264,272 ----
*
*/
! protected Vector close(JmsServerSession session,
! MultiplexConnectionIfc connection) {
if (session != null) {
try {
! IpcJmsServer.instance().removeConnection(session, connection);
session.close();
} catch (JMSException err) {
Index: IpcJmsSessionList.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc/IpcJmsSessionList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IpcJmsSessionList.java 20 Jul 2001 07:53:56 -0000 1.4
--- IpcJmsSessionList.java 22 Jan 2003 23:39:55 -0000 1.5
***************
*** 39,43 ****
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 2000 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
--- 39,43 ----
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 2000-2003 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
***************
*** 50,59 ****
package org.exolab.jms.server.mipc;
- import java.util.Enumeration;
- import java.util.HashMap;
import java.io.IOException;
! import org.exolab.jms.server.JmsServerSession;
import org.exolab.core.mipc.MultiplexConnectionIfc;
import org.exolab.core.mipc.ObjectChannel;
--- 50,60 ----
package org.exolab.jms.server.mipc;
import java.io.IOException;
! import java.util.HashMap;
! import java.util.Iterator;
!
import org.exolab.core.mipc.MultiplexConnectionIfc;
import org.exolab.core.mipc.ObjectChannel;
+ import org.exolab.jms.server.JmsServerSession;
***************
*** 68,181 ****
* @author <a href="mailto:mou...@ex...">Jim Mourikis</a>
* @see org.exolab.jms.server.mipc.IpcJmsServer
! * @see org.exolab.jms.server.mipc.IpcJmsSessionSender
! *
! **/
!
! public class IpcJmsSessionList
! {
! // The client connection.
! private ObjectChannel client_;
! // The list of session senders
! private HashMap list_;
! /**
! * Create a connection to the client listener for sending JmsMessages.
! *
! * @param connection The MultiplexConnection between client and server
! * @exception IOException If a connection error results.
! *
! */
! public IpcJmsSessionList(MultiplexConnectionIfc connection)
! throws IOException
! {
! list_ = new HashMap(10);
! client_ = new ObjectChannel( "message", connection );
! }
!
!
! /**
! * Add a new session sender for the client. If its not already active.
! *
! * @param session The session to add a notifier on
! *
! */
! public void add(JmsServerSession session)
! {
! if (!list_.containsKey(session.getSessionId()))
! {
! list_.put(session.getSessionId(),
! new IpcJmsSessionSender(client_, session));
! }
! }
!
! /**
! * Remove a sesson notifier. If this is the last session for this client
! * close the client connection.
! *
! * @param session The session to remove the notifier from
! * @return boolean True there are no more connections for this client
! *
! */
! public boolean remove(JmsServerSession session)
! {
! IpcJmsSessionSender sender =
! (IpcJmsSessionSender)list_.remove(session.getSessionId());
! boolean result = false;
! if (sender != null)
! {
! sender.close();
! }
! if (list_.size() == 0)
! {
! closeConnection();
! list_= null;
! result = true;
! }
! return result;
! }
!
! /**
! * Remove all session notfiers and close the client connection.
! *
! */
! public void removeAll()
! {
! Object[] e = list_.values().toArray();
!
! for (int i = 0, j = list_.size(); i < j; i++)
! {
! ((IpcJmsSessionSender)e[i]).close();
! }
! closeConnection();
! list_.clear();
! list_= null;
! }
! // Close the connection to the client
! private void closeConnection()
! {
! if (client_ != null)
! {
! try
! {
! client_.close();
! }
! catch(IOException err)
! {
! System.err.println("mipc.IpcJmsSessionList: Failed to close client connection\n"
! + err);
! }
! client_ = null;
! }
! }
!
!
! } // End IpcJmsSessionList
--- 69,161 ----
* @author <a href="mailto:mou...@ex...">Jim Mourikis</a>
* @see org.exolab.jms.server.mipc.IpcJmsServer
! * @see org.exolab.jms.server.mipc.IpcJmsSessionSender
! */
! public class IpcJmsSessionList {
! /**
! * The client connection.
! */
! private ObjectChannel _client;
! /**
! * The list of session senders
! */
! private HashMap _list;
+
+ /**
+ * Create a connection to the client listener for sending JmsMessages.
+ *
+ * @param connection The MultiplexConnection between client and server
+ * @exception IOException If a connection error results.
+ *
+ */
+ public IpcJmsSessionList(MultiplexConnectionIfc connection)
+ throws IOException {
+ _list = new HashMap(10);
+ _client = new ObjectChannel("message", connection);
+ }
! /**
! * Add a new session sender for the client. If its not already active.
! *
! * @param session The session to add a notifier on
! */
! public synchronized void add(JmsServerSession session) {
! if (!_list.containsKey(session.getSessionId())) {
! _list.put(session.getSessionId(),
! new IpcJmsSessionSender(_client, session));
! }
! }
! /**
! * Remove a sesson notifier. If this is the last session for this client
! * close the client connection.
! *
! * @param session The session to remove the notifier from
! * @return boolean True there are no more connections for this client
! *
! */
! public synchronized boolean remove(JmsServerSession session) {
! IpcJmsSessionSender sender =
! (IpcJmsSessionSender)_list.remove(session.getSessionId());
! boolean result = false;
! if (sender != null) {
! sender.close();
! }
! if (_list.isEmpty()) {
! closeConnection();
! _list= null;
! result = true;
! }
! return result;
! }
! /**
! * Remove all session notfiers and close the client connection.
! */
! public synchronized void removeAll() {
! Iterator iterator = _list.values().iterator();
! while (iterator.hasNext()) {
! IpcJmsSessionSender sender = (IpcJmsSessionSender) iterator.next();
! sender.close();
! }
! _list.clear();
! closeConnection();
! _list= null;
! }
+ // Close the connection to the client
+ private void closeConnection() {
+ if (_client != null) {
+ try {
+ _client.close();
+ } catch(IOException ignore) {
+ }
+ _client = null;
+ }
+ }
! } //-- IpcJmsSessionList
Index: IpcJmsSessionSender.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc/IpcJmsSessionSender.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IpcJmsSessionSender.java 18 Jan 2003 02:04:29 -0000 1.7
--- IpcJmsSessionSender.java 22 Jan 2003 23:39:55 -0000 1.8
***************
*** 39,43 ****
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 2000 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
--- 39,43 ----
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 2000-2003 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
***************
*** 53,64 ****
import javax.jms.Message;
import java.io.IOException;
- import org.exolab.jms.server.JmsServerSession;
import org.exolab.core.mipc.ObjectChannel;
- import org.exolab.jms.message.MessageImpl;
import org.exolab.jms.client.JmsMessageListener;
/**
! * This class conatins the ipc connection to a receiver or subscriber
* for passing the JmsMessages.
*
--- 53,65 ----
import javax.jms.Message;
import java.io.IOException;
import org.exolab.core.mipc.ObjectChannel;
import org.exolab.jms.client.JmsMessageListener;
+ import org.exolab.jms.message.MessageImpl;
+ import org.exolab.jms.server.ClientDisconnectionException;
+ import org.exolab.jms.server.JmsServerSession;
/**
! * This class contains the ipc connection to a receiver or subscriber
* for passing the JmsMessages.
*
***************
*** 68,77 ****
* @author <a href="mailto:mou...@ex...">Jim Mourikis</a>
* @see org.exolab.jms.server.mipc.IpcJmsSessionConnection
! * @see org.exolab.jms.server.JmsServerSession
! * @see org.exolab.core.ipc.Client
*
! **/
!
!
public class IpcJmsSessionSender implements JmsMessageListener {
// The client connection.
--- 69,76 ----
* @author <a href="mailto:mou...@ex...">Jim Mourikis</a>
* @see org.exolab.jms.server.mipc.IpcJmsSessionConnection
! * @see org.exolab.jms.server.JmsServerSession
! * @see org.exolab.core.ipc.Client
*
! */
public class IpcJmsSessionSender implements JmsMessageListener {
// The client connection.
***************
*** 81,85 ****
private JmsServerSession session_ = null;
-
/**
* Create a connection to the client listener for sending JmsMessages.
--- 80,83 ----
***************
*** 89,93 ****
*
*/
! public IpcJmsSessionSender(ObjectChannel client, JmsServerSession session) {
client_ = client;
session_ = session;
--- 87,92 ----
*
*/
! public IpcJmsSessionSender(ObjectChannel client,
! JmsServerSession session) {
client_ = client;
session_ = session;
***************
*** 95,106 ****
}
-
/**
* Send a JmsMessage to a listener.
*
* @param message The message to send.
- *
*/
! public void onMessage(Message message) {
try {
if (client_ != null) {
--- 94,103 ----
}
/**
* Send a JmsMessage to a listener.
*
* @param message The message to send.
*/
! public synchronized void onMessage(Message message) {
try {
if (client_ != null) {
***************
*** 115,126 ****
// calls. I could synchronize the inside of the channel
// but decided to do it right here for now.
! synchronized(client_) {
! client_.send(v);
! Vector reply = (Vector) client_.receive();
! }
}
} catch (Exception err) {
! throw new org.exolab.jms.server.ClientDisconnectionException
! (err.getMessage());
}
}
--- 112,120 ----
// calls. I could synchronize the inside of the channel
// but decided to do it right here for now.
! client_.send(v);
! Vector reply = (Vector) client_.receive();
}
} catch (Exception err) {
! throw new ClientDisconnectionException(err.getMessage());
}
}
***************
*** 132,136 ****
* @param messages - collection of MessageImpl objects
*/
! public void onMessages(Vector messages) {
try {
if (client_ != null) {
--- 126,130 ----
* @param messages - collection of MessageImpl objects
*/
! public synchronized void onMessages(Vector messages) {
try {
if (client_ != null) {
***************
*** 144,156 ****
// calls. I could synchronize the inside of the channel
// but decided to do it right here for now.
! synchronized(client_) {
! client_.send(v);
! Vector reply = (Vector) client_.receive();
! }
}
} catch (Exception err) {
! // System.err.println("Failure sending message" + err);
! throw new org.exolab.jms.server.ClientDisconnectionException
! (err.getMessage());
}
}
--- 138,146 ----
// calls. I could synchronize the inside of the channel
// but decided to do it right here for now.
! client_.send(v);
! Vector reply = (Vector) client_.receive();
}
} catch (Exception err) {
! throw new ClientDisconnectionException(err.getMessage());
}
}
***************
*** 161,165 ****
* @param clinet - the client identity
*/
! public void onMessageAvailable(long clientId) {
try {
if (client_ != null) {
--- 151,155 ----
* @param clinet - the client identity
*/
! public synchronized void onMessageAvailable(long clientId) {
try {
if (client_ != null) {
***************
*** 173,182 ****
// calls. I could synchronize the inside of the channel
// but decided to do it right here for now.
! synchronized(client_) {
! client_.send(v);
! }
}
! } catch (IOException err) {
! throw new org.exolab.jms.server.ClientDisconnectionException(err.getMessage());
}
}
--- 163,171 ----
// calls. I could synchronize the inside of the channel
// but decided to do it right here for now.
! client_.send(v);
! Vector reply = (Vector) client_.receive();
}
! } catch (Exception err) {
! throw new ClientDisconnectionException(err.getMessage());
}
}
***************
*** 184,198 ****
/**
* Remove the callback from the JmsServerSession.
- *
*/
! public void close() {
if (session_ != null) {
session_.setMessageListener(null);
session_ = null;
}
-
client_ = null;
}
!
! } // End IpcJmsSessionSender
--- 173,184 ----
/**
* Remove the callback from the JmsServerSession.
*/
! public synchronized void close() {
if (session_ != null) {
session_.setMessageListener(null);
session_ = null;
}
client_ = null;
}
! } //-- IpcJmsSessionSender
|
|
From: <tan...@us...> - 2003-01-21 22:45:26
|
Update of /cvsroot/openjms/openjmstests/src/etc In directory sc8-pr-cvs1:/tmp/cvs-serv29545/src/etc Modified Files: JARS Log Message: updated to exolabcore 0.3.4 Index: JARS =================================================================== RCS file: /cvsroot/openjms/openjmstests/src/etc/JARS,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JARS 13 Jan 2003 11:30:05 -0000 1.8 --- JARS 21 Jan 2003 22:45:23 -0000 1.9 *************** *** 5,9 **** project.jar.ant_optional=ant_optional_1.3.1.jar project.jar.castor=castor-0.9.3.jar ! project.jar.exolabcore=exolabcore-0.3.2.jar project.jar.jms=jms_1.0.2a.jar project.jar.jndi=jndi_1.2.1.jar --- 5,9 ---- project.jar.ant_optional=ant_optional_1.3.1.jar project.jar.castor=castor-0.9.3.jar ! project.jar.exolabcore=exolabcore-0.3.4.jar project.jar.jms=jms_1.0.2a.jar project.jar.jndi=jndi_1.2.1.jar |
|
From: <tan...@us...> - 2003-01-21 22:44:47
|
Update of /cvsroot/openjms/openjmstests/src/compliance/com/intalio/jms/test/compliance/connection
In directory sc8-pr-cvs1:/tmp/cvs-serv29212/src/compliance/com/intalio/jms/test/compliance/connection
Modified Files:
ClientIdentifierTest.java
Log Message:
test case fix
Index: ClientIdentifierTest.java
===================================================================
RCS file: /cvsroot/openjms/openjmstests/src/compliance/com/intalio/jms/test/compliance/connection/ClientIdentifierTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ClientIdentifierTest.java 12 Sep 2001 00:29:39 -0000 1.5
--- ClientIdentifierTest.java 21 Jan 2003 22:44:42 -0000 1.6
***************
*** 146,152 ****
public void testDuplicateClientID() throws Exception {
TestContext context = getContext();
Connection second = null;
- Connection first = null;
boolean test = true;
try {
second = ConnectionFactoryHelper.createConnection(context,
--- 146,153 ----
public void testDuplicateClientID() throws Exception {
TestContext context = getContext();
+ Connection first = context.getConnection();
Connection second = null;
boolean test = true;
+
try {
second = ConnectionFactoryHelper.createConnection(context,
|
|
From: <tan...@us...> - 2003-01-21 22:43:50
|
Update of /cvsroot/openjms/openjmstests/lib In directory sc8-pr-cvs1:/tmp/cvs-serv28562 Added Files: exolabcore-0.3.4.jar Removed Files: exolabcore-0.3.2.jar Log Message: updated to exolabcore 0.3.4 --- NEW FILE: exolabcore-0.3.4.jar --- (This appears to be a binary file; contents omitted.) --- exolabcore-0.3.2.jar DELETED --- |
|
From: <tan...@us...> - 2003-01-21 14:28:12
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/client
In directory sc8-pr-cvs1:/tmp/cvs-serv25715/src/main/org/exolab/jms/client
Modified Files:
JmsTopicSubscriber.java
Log Message:
fixed NPE if subscriber closed twice
Index: JmsTopicSubscriber.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/JmsTopicSubscriber.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JmsTopicSubscriber.java 12 Oct 2001 07:55:31 -0000 1.7
--- JmsTopicSubscriber.java 21 Jan 2003 14:28:06 -0000 1.8
***************
*** 152,162 ****
// overwrites of JmsMessageConsumer.close
! public void close()
! throws JMSException
! {
! // unregister this publisher from the session amd then call the base
! // class method.
! ((JmsTopicSession)_session).removeSubscriber(this);
! super.close();
}
--- 152,162 ----
// overwrites of JmsMessageConsumer.close
! public void close() throws JMSException {
! if (_session != null) {
! // unregister this publisher from the session amd then call the
! // base class method.
! ((JmsTopicSession)_session).removeSubscriber(this);
! super.close();
! }
}
|
|
From: <tan...@us...> - 2003-01-21 14:27:22
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/client
In directory sc8-pr-cvs1:/tmp/cvs-serv25258/src/main/org/exolab/jms/client
Modified Files:
JmsTopicPublisher.java
Log Message:
fixed NPE if publisher closed twice
Index: JmsTopicPublisher.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/JmsTopicPublisher.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JmsTopicPublisher.java 12 Oct 2001 07:55:31 -0000 1.8
--- JmsTopicPublisher.java 21 Jan 2003 14:27:19 -0000 1.9
***************
*** 39,43 ****
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 1999 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
--- 39,43 ----
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 2000-2003 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
***************
*** 48,57 ****
package org.exolab.jms.client;
import javax.jms.JMSException;
- import javax.jms.TopicPublisher;
import javax.jms.Message;
- import javax.jms.DeliveryMode;
import javax.jms.Topic;
! import org.exolab.jms.message.DestinationImpl;
/**
--- 48,58 ----
package org.exolab.jms.client;
+ import javax.jms.DeliveryMode;
+ import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Topic;
! import javax.jms.TopicPublisher;
!
/**
***************
*** 120,170 ****
// implementation of JmsTopicPublisher.publish
public void publish(Topic topic, Message message, int deliveryMode,
! int priority, long timeToLive)
! throws JMSException
! {
! try {
! // ensure that a topic has been specified
! if (topic == null) {
! throw new JMSException("publish failed : No topic specified");
! }
!
! // ensure that a message has been specified
! if (message == null) {
! throw new JMSException("send failed b/c message is null");
! }
! // the timestamp, expiration time and the client ids are all
! // generated by the message manager
! if (timeToLive > 0) {
! message.setJMSExpiration(System.currentTimeMillis() +
! timeToLive);
! } else {
! message.setJMSExpiration(0);
! }
! // if the queue is an instance of a TemporaryTopic then
! // override the deliveryMode to NON_PERSISTENT
! if (topic instanceof JmsTemporaryTopic) {
! message.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
! } else {
! message.setJMSDeliveryMode(deliveryMode);
! }
! message.setJMSPriority(priority);
! message.setJMSDestination(topic);
! super.sendMessage(message);
! } catch (Exception exception) {
! throw new JMSException("Error in publish " + exception);
}
}
// overwrites of JmsMessageProducer.close
! public void close()
! throws JMSException
! {
! // unregister this publisher from the session amd then call the base
! // class method.
! ((JmsTopicSession)_session).removePublisher(this);
! super.close();
}
--- 121,163 ----
// implementation of JmsTopicPublisher.publish
public void publish(Topic topic, Message message, int deliveryMode,
! int priority, long timeToLive) throws JMSException {
! if (topic == null) {
! throw new InvalidDestinationException(
! "Argument 'topic' is null");
! }
! if (message == null) {
! throw new JMSException("Argument 'message' is null");
! }
! // the timestamp, expiration time and the client ids are all
! // generated by the message manager
! if (timeToLive > 0) {
! message.setJMSExpiration(System.currentTimeMillis() + timeToLive);
! } else {
! message.setJMSExpiration(0);
! }
! // if the queue is an instance of a TemporaryTopic then
! // override the deliveryMode to NON_PERSISTENT
! if (topic instanceof JmsTemporaryTopic) {
! message.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
! } else {
! message.setJMSDeliveryMode(deliveryMode);
}
+
+ message.setJMSPriority(priority);
+ message.setJMSDestination(topic);
+ super.sendMessage(message);
}
// overwrites of JmsMessageProducer.close
! public void close() throws JMSException {
! if (_session != null) {
! // unregister this publisher from the session amd then call the
! // base class method.
! ((JmsTopicSession)_session).removePublisher(this);
! super.close();
! }
}
|
|
From: <tan...@us...> - 2003-01-21 14:26:51
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/client
In directory sc8-pr-cvs1:/tmp/cvs-serv24934/src/main/org/exolab/jms/client
Modified Files:
JmsQueueSender.java
Log Message:
fixed NPE if sender closed twice
Index: JmsQueueSender.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/JmsQueueSender.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JmsQueueSender.java 12 Oct 2001 07:55:31 -0000 1.5
--- JmsQueueSender.java 21 Jan 2003 14:26:43 -0000 1.6
***************
*** 39,43 ****
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 1999 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
--- 39,43 ----
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
! * Copyright 2000-2003 (C) Exoffice Technologies Inc. All Rights Reserved.
*
* $Id$
***************
*** 49,60 ****
import javax.jms.JMSException;
import javax.jms.QueueSender;
import javax.jms.Queue;
! import javax.jms.Message;
! import javax.jms.DeliveryMode;
/**
! * This class is used for sending messages to a queue. It extends JmsMessage-
! * Producer..
*
* @version $Revision$ $Date$
--- 49,62 ----
+ import javax.jms.DeliveryMode;
+ import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
+ import javax.jms.Message;
import javax.jms.QueueSender;
import javax.jms.Queue;
!
!
/**
! * This class is used for sending messages to a queue.
*
* @version $Revision$ $Date$
***************
*** 122,178 ****
// implementation of QueueSender.send(message, deliveryMode, priority,ttl)
! public void send(Queue queue, Message message, int deliveryMode, int priority,
! long timeToLive)
! throws JMSException
! {
! try {
! // ensure that a queue has been specified
! if (queue == null) {
! throw new JMSException("send failed : null queue specified");
! }
! if (message == null) {
! throw new JMSException("send failed : null message specified");
! }
! // the timestamp, expiration time and the client ids are all
! // generated by the message manager
! if (timeToLive > 0) {
! message.setJMSExpiration(System.currentTimeMillis() +
! timeToLive);
! } else {
! message.setJMSExpiration(0);
! }
! // if the queue is an instance of a TemporaryQueue then
! // override the deliveryMode to NON_PERSISTENT
! if (queue instanceof JmsTemporaryQueue) {
! message.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
! } else {
! message.setJMSDeliveryMode(deliveryMode);
! }
! message.setJMSPriority(priority);
! message.setJMSDestination(queue);
! super.sendMessage(message);
! } catch (Exception exception) {
! throw new JMSException("Error in send " + exception);
}
}
// overwrites of JmsMessageProducer.close
! public void close()
! throws JMSException
! {
! // unregister this producer from the session before closing.amd then
! // call the base class method.
! ((JmsQueueSession)_session).removeSender(this);
! super.close();
}
// overwrites of JmsMessageProducer.destroy
! public void destroy()
! throws JMSException
! {
_queue = null;
super.destroy();
--- 124,172 ----
// implementation of QueueSender.send(message, deliveryMode, priority,ttl)
! public void send(Queue queue, Message message, int deliveryMode,
! int priority, long timeToLive) throws JMSException {
! if (queue == null) {
! throw new InvalidDestinationException("Argument 'queue' is null");
! }
! if (message == null) {
! throw new JMSException("Argument 'message' is null");
! }
! // the timestamp, expiration time and the client ids are all
! // generated by the message manager
! if (timeToLive > 0) {
! message.setJMSExpiration(System.currentTimeMillis() +
! timeToLive);
! } else {
! message.setJMSExpiration(0);
! }
! // if the queue is an instance of a TemporaryQueue then
! // override the deliveryMode to NON_PERSISTENT
! if (queue instanceof JmsTemporaryQueue) {
! message.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
! } else {
! message.setJMSDeliveryMode(deliveryMode);
}
+
+ message.setJMSPriority(priority);
+ message.setJMSDestination(queue);
+ super.sendMessage(message);
}
// overwrites of JmsMessageProducer.close
! public void close() throws JMSException {
! if (_session != null) {
! // unregister this producer from the session before closing.
! // and then call the base class method.
! ((JmsQueueSession)_session).removeSender(this);
! super.close();
! }
}
// overwrites of JmsMessageProducer.destroy
! public void destroy() throws JMSException {
_queue = null;
super.destroy();
|
|
From: <tan...@us...> - 2003-01-21 14:26:02
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/client
In directory sc8-pr-cvs1:/tmp/cvs-serv24568/src/main/org/exolab/jms/client
Modified Files:
JmsQueueReceiver.java
Log Message:
fixed NPE if consumer closed twice
Index: JmsQueueReceiver.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/JmsQueueReceiver.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JmsQueueReceiver.java 12 Oct 2001 07:55:31 -0000 1.8
--- JmsQueueReceiver.java 21 Jan 2003 14:25:59 -0000 1.9
***************
*** 112,122 ****
// overwrites of JmsMessageConsumer.close
! public void close()
! throws JMSException
! {
! // unregister this receiver from the session before closing, and then
! // call the base class method.
! ((JmsQueueSession)_session).removeReceiver(this);
! super.close();
}
--- 112,122 ----
// overwrites of JmsMessageConsumer.close
! public void close() throws JMSException {
! if (_session != null) {
! // unregister this receiver from the session before closing, and
! // then call the base class method.
! ((JmsQueueSession)_session).removeReceiver(this);
! super.close();
! }
}
|
|
From: <tan...@us...> - 2003-01-19 02:46:02
|
Update of /cvsroot/openjms/exolabcore/src/main/org/exolab/core/util
In directory sc8-pr-cvs1:/tmp/cvs-serv15630/src/main/org/exolab/core/util
Modified Files:
OrderedQueue.java
Log Message:
fixed unreachable statement error when compiling under jdk 1.4 - reported by Joe McMahon
Index: OrderedQueue.java
===================================================================
RCS file: /cvsroot/openjms/exolabcore/src/main/org/exolab/core/util/OrderedQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OrderedQueue.java 3 Mar 2000 06:07:13 -0000 1.1
--- OrderedQueue.java 19 Jan 2003 02:45:59 -0000 1.2
***************
*** 196,200 ****
public synchronized Object removeFirstElement()
{
! return queue_.remove(0);;
}
--- 196,200 ----
public synchronized Object removeFirstElement()
{
! return queue_.remove(0);
}
|
|
From: <tan...@us...> - 2003-01-19 02:41:56
|
Update of /cvsroot/openjms/exolabcore In directory sc8-pr-cvs1:/tmp/cvs-serv13222 Modified Files: build.sh Log Message: fixed ant version - reported by Joe McMahon Index: build.sh =================================================================== RCS file: /cvsroot/openjms/exolabcore/build.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.sh 29 Jan 2002 05:21:20 -0000 1.4 --- build.sh 19 Jan 2003 02:41:53 -0000 1.5 *************** *** 23,27 **** CP=$JAVA_HOME/lib/tools.jar ! CP=lib/ant_1.3.jar:$CP CP=lib/exolabtools-1.0.jar:$CP CP=lib/oro-2.0.4.jar:$CP --- 23,27 ---- CP=$JAVA_HOME/lib/tools.jar ! CP=lib/ant_1.5.jar:$CP CP=lib/exolabtools-1.0.jar:$CP CP=lib/oro-2.0.4.jar:$CP |
|
From: <tan...@us...> - 2003-01-18 02:47:52
|
Update of /cvsroot/openjms/openjms/lib In directory sc8-pr-cvs1:/tmp/cvs-serv1017 Added Files: exolabcore-0.3.4.jar Removed Files: exolabcore-0.3.3.jar Log Message: updated to exolabcore 0.3.4 --- NEW FILE: exolabcore-0.3.4.jar --- (This appears to be a binary file; contents omitted.) --- exolabcore-0.3.3.jar DELETED --- |
|
From: <tan...@us...> - 2003-01-18 02:45:22
|
Update of /cvsroot/openjms/exolabcore/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31684/src
Modified Files:
build.xml
Log Message:
removed copy of support files from tarball
Index: build.xml
===================================================================
RCS file: /cvsroot/openjms/exolabcore/src/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** build.xml 15 Feb 2002 08:34:59 -0000 1.11
--- build.xml 18 Jan 2003 02:45:19 -0000 1.12
***************
*** 349,356 ****
<!-- copy the support files -->
! <mkdir dir="${build.dir}/${archive}/config" />
<copy todir="${build.dir}/${archive}/config">
<fileset dir="${tests.etc.dir}"/>
! </copy>
<!-- copy the documentation -->
--- 349,356 ----
<!-- copy the support files -->
! <!--mkdir dir="${build.dir}/${archive}/config" />
<copy todir="${build.dir}/${archive}/config">
<fileset dir="${tests.etc.dir}"/>
! </copy-->
<!-- copy the documentation -->
|
|
From: <tan...@us...> - 2003-01-18 02:43:06
|
Update of /cvsroot/openjms/exolabcore/src/etc In directory sc8-pr-cvs1:/tmp/cvs-serv29860 Modified Files: VERSION Log Message: version 0.3.4 build 3 Index: VERSION =================================================================== RCS file: /cvsroot/openjms/exolabcore/src/etc/VERSION,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** VERSION 18 Jan 2003 01:29:53 -0000 1.5 --- VERSION 18 Jan 2003 02:43:02 -0000 1.6 *************** *** 1,5 **** ! #Wed Feb 13 10:25:16 GMT+11:00 2002 api.packages=org.exolab.core.logger,org.exolab.core.service ! build.number=2 all.packages=org.exolab.* copyright=Exolab Inc. (C) 1999-2002. All rights reserved. www.exolab.org --- 1,5 ---- ! #Sat Jan 18 13:43:11 EST 2003 api.packages=org.exolab.core.logger,org.exolab.core.service ! build.number=3 all.packages=org.exolab.* copyright=Exolab Inc. (C) 1999-2002. All rights reserved. www.exolab.org |
|
From: <tan...@us...> - 2003-01-18 02:17:28
|
Update of /cvsroot/openjms/exolabcore In directory sc8-pr-cvs1:/tmp/cvs-serv8697 Added Files: test.bat Log Message: created --- NEW FILE: test.bat --- @echo off if not defined JAVA_HOME ( echo JAVA_HOME not set exit 1 ) set JAVA=%JAVA_HOME%\bin\java set CP=build\classes;build\tests set CP=lib\log4j_1.1.3.jar;%CP% set CP=lib\jdbm.jar;%CP% set CP=lib\junit_3.7.jar;%CP% set CP=lib\oro-2.0.4.jar;%CP% set CP=lib\xerces-J_1.3.1.jar;%CP% echo %CP% %JAVA% -classpath %CP% org.exolab.core.test.CoreTestSuite %* |
|
From: <tan...@us...> - 2003-01-18 02:14:17
|
Update of /cvsroot/openjms/openjms/src/etc In directory sc8-pr-cvs1:/tmp/cvs-serv6184/src/etc Modified Files: JARS Log Message: updated exolabcore to 0.3.4 Index: JARS =================================================================== RCS file: /cvsroot/openjms/openjms/src/etc/JARS,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** JARS 3 Jan 2003 04:48:00 -0000 1.16 --- JARS 18 Jan 2003 02:14:14 -0000 1.17 *************** *** 4,8 **** project.jar.antlrall=antlrall_2.7.2a2.jar project.jar.castor=castor-0.9.3.jar ! project.jar.exolabcore=exolabcore-0.3.3.jar project.jar.exolabtools=exolabtools-1.0.jar project.jar.hsql=hsqldb_1.61.jar --- 4,8 ---- project.jar.antlrall=antlrall_2.7.2a2.jar project.jar.castor=castor-0.9.3.jar ! project.jar.exolabcore=exolabcore-0.3.4.jar project.jar.exolabtools=exolabtools-1.0.jar project.jar.hsql=hsqldb_1.61.jar |
|
From: <tan...@us...> - 2003-01-18 02:13:46
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/http
In directory sc8-pr-cvs1:/tmp/cvs-serv5642/src/main/org/exolab/jms/server/http
Modified Files:
HttpJmsSessionSender.java
Log Message:
fix for bug 669698 - HttpJmsSessionSender.onMessage() and onMessages() now wait for a reply (an empty Vector) from HttpJmsSessionStub before returning
Index: HttpJmsSessionSender.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/http/HttpJmsSessionSender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HttpJmsSessionSender.java 10 Jan 2003 20:38:39 -0000 1.4
--- HttpJmsSessionSender.java 18 Jan 2003 02:13:43 -0000 1.5
***************
*** 125,131 ****
v.add((MessageImpl)message);
pinger_.reset();
! client_.sendWithoutResponse(v, host_, port_);
}
! } catch (IOException err) {
throw new org.exolab.jms.server.ClientDisconnectionException(err.getMessage());
}
--- 125,135 ----
v.add((MessageImpl)message);
pinger_.reset();
! synchronized (client_) {
! client_.send(v, host_, port_);
! Vector reply = (Vector) client_.receive();
! }
}
! } catch (Exception err) {
! err.printStackTrace();
throw new org.exolab.jms.server.ClientDisconnectionException(err.getMessage());
}
***************
*** 145,151 ****
v.add(messages);
pinger_.reset();
! client_.sendWithoutResponse(v, host_, port_);
}
! } catch (IOException err) {
close();
throw new org.exolab.jms.server.ClientDisconnectionException(err.getMessage());
--- 149,158 ----
v.add(messages);
pinger_.reset();
! synchronized (client_) {
! client_.send(v, host_, port_);
! Vector reply = (Vector) client_.receive();
! }
}
! } catch (Exception err) {
close();
throw new org.exolab.jms.server.ClientDisconnectionException(err.getMessage());
***************
*** 182,186 ****
Vector v = new Vector(1);
v.add(session_.getSessionId());
! client_.sendWithoutResponse(v, host_, port_);
}
} catch (IOException err) {
--- 189,195 ----
Vector v = new Vector(1);
v.add(session_.getSessionId());
! synchronized (client_) {
! client_.sendWithoutResponse(v, host_, port_);
! }
}
} catch (IOException err) {
|
|
From: <tan...@us...> - 2003-01-18 02:13:45
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/http/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv5642/src/main/org/exolab/jms/client/http/servlet
Modified Files:
HttpJmsClientServlet.java
Log Message:
fix for bug 669698 - HttpJmsSessionSender.onMessage() and onMessages() now wait for a reply (an empty Vector) from HttpJmsSessionStub before returning
Index: HttpJmsClientServlet.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/http/servlet/HttpJmsClientServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HttpJmsClientServlet.java 3 Jan 2003 04:38:58 -0000 1.3
--- HttpJmsClientServlet.java 18 Jan 2003 02:13:43 -0000 1.4
***************
*** 118,128 ****
if (object instanceof Vector) {
Vector message = (Vector) object;
! try {
! getConnection(host, port).send(message);
! } catch (IOException exception) {
! // might have dropped connection - attempt to re-etsablish.
! removeConnection(host, port);
! getConnection(host, port).send(message);
}
response.setStatus(HttpServletResponse.SC_OK);
} else {
--- 118,131 ----
if (object instanceof Vector) {
Vector message = (Vector) object;
! Client connection = getConnection(host, port);
! synchronized (connection) {
! connection.send(message);
! String type = request.getHeader("jms-response");
! if (type != null && type.equals("yes")) {
! message = (Vector) connection.receive();
! output.writeObject(message);
! }
}
+
response.setStatus(HttpServletResponse.SC_OK);
} else {
|
|
From: <tan...@us...> - 2003-01-18 02:13:45
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv5642/src/main/org/exolab/jms/client/http
Modified Files:
HttpJmsSessionStub.java
Log Message:
fix for bug 669698 - HttpJmsSessionSender.onMessage() and onMessages() now wait for a reply (an empty Vector) from HttpJmsSessionStub before returning
Index: HttpJmsSessionStub.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/client/http/HttpJmsSessionStub.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HttpJmsSessionStub.java 10 Jan 2003 20:37:53 -0000 1.9
--- HttpJmsSessionStub.java 18 Jan 2003 02:13:42 -0000 1.10
***************
*** 1006,1009 ****
--- 1006,1010 ----
public Serializable notify(Object ob, String id) {
Vector v = (Vector)ob;
+ Vector reply = new Vector();
if (listener_ != null) {
***************
*** 1016,1023 ****
listener_.onMessageAvailable(((Long)v.get(1)).longValue());
}
}
- // if size == 1, then this is just a ping. Nothing to do.
}
! return null;
}
--- 1017,1025 ----
listener_.onMessageAvailable(((Long)v.get(1)).longValue());
}
+ } else {
+ // if size == 1, then this is just a ping.
}
}
! return reply;
}
|
|
From: <tan...@us...> - 2003-01-18 02:10:25
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/http
In directory sc8-pr-cvs1:/tmp/cvs-serv2807/src/main/org/exolab/jms/server/http
Modified Files:
HttpJmsSessionConnection.java
Log Message:
made createReceiver(), createPublisher(), close() protected so that they can overridde those specified by IpcJmsSessionConnection - not sure how this ever worked in the past...
Index: HttpJmsSessionConnection.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/http/HttpJmsSessionConnection.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HttpJmsSessionConnection.java 7 Jan 2003 09:29:57 -0000 1.7
--- HttpJmsSessionConnection.java 18 Jan 2003 02:10:21 -0000 1.8
***************
*** 132,136 ****
*
*/
! private Vector createReceiver(JmsServerSession session, JmsQueue queue,
Long consumerId, String selector,
MultiplexConnectionIfc not_used, String host, String port, String url)
--- 132,136 ----
*
*/
! protected Vector createReceiver(JmsServerSession session, JmsQueue queue,
Long consumerId, String selector,
MultiplexConnectionIfc not_used, String host, String port, String url)
***************
*** 167,171 ****
*
*/
! private Vector createBrowser(JmsServerSession session,
JmsQueue queue, Long clientId, String selector,
MultiplexConnectionIfc not_used, String host, String port, String url) {
--- 167,171 ----
*
*/
! protected Vector createBrowser(JmsServerSession session,
JmsQueue queue, Long clientId, String selector,
MultiplexConnectionIfc not_used, String host, String port, String url) {
***************
*** 231,235 ****
*
*/
! private Vector close(JmsServerSession session) {
if (session != null) {
try {
--- 231,235 ----
*
*/
! protected Vector close(JmsServerSession session) {
if (session != null) {
try {
|
|
From: <tan...@us...> - 2003-01-18 02:04:32
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc
In directory sc8-pr-cvs1:/tmp/cvs-serv31765/src/main/org/exolab/jms/server/mipc
Modified Files:
IpcJmsSessionSender.java
Log Message:
fix for bug 669698 - onMessage() and onMessages() now wait for a reply (any empty Vector) from IpcJmsSessionStub before returning
Index: IpcJmsSessionSender.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc/IpcJmsSessionSender.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IpcJmsSessionSender.java 10 Jan 2003 20:38:40 -0000 1.6
--- IpcJmsSessionSender.java 18 Jan 2003 02:04:29 -0000 1.7
***************
*** 117,123 ****
synchronized(client_) {
client_.send(v);
}
}
! } catch (IOException err) {
throw new org.exolab.jms.server.ClientDisconnectionException
(err.getMessage());
--- 117,124 ----
synchronized(client_) {
client_.send(v);
+ Vector reply = (Vector) client_.receive();
}
}
! } catch (Exception err) {
throw new org.exolab.jms.server.ClientDisconnectionException
(err.getMessage());
***************
*** 145,151 ****
synchronized(client_) {
client_.send(v);
}
}
! } catch (IOException err) {
// System.err.println("Failure sending message" + err);
throw new org.exolab.jms.server.ClientDisconnectionException
--- 146,153 ----
synchronized(client_) {
client_.send(v);
+ Vector reply = (Vector) client_.receive();
}
}
! } catch (Exception err) {
// System.err.println("Failure sending message" + err);
throw new org.exolab.jms.server.ClientDisconnectionException
|
|
From: <tan...@us...> - 2003-01-18 01:58:43
|
Update of /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc
In directory sc8-pr-cvs1:/tmp/cvs-serv29939/src/main/org/exolab/jms/server/mipc
Modified Files:
IpcJmsSessionConnection.java
Log Message:
made createReceiver(), createPublisher(), close() protected so that they can be overridden by HttpJmsSessionConnection
Index: IpcJmsSessionConnection.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/main/org/exolab/jms/server/mipc/IpcJmsSessionConnection.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** IpcJmsSessionConnection.java 7 Jan 2003 09:29:58 -0000 1.17
--- IpcJmsSessionConnection.java 18 Jan 2003 01:58:40 -0000 1.18
***************
*** 264,268 ****
*
*/
! private Vector close(JmsServerSession session) {
if (session != null) {
try {
--- 264,268 ----
*
*/
! protected Vector close(JmsServerSession session) {
if (session != null) {
try {
***************
*** 464,468 ****
*
*/
! private Vector createReceiver
(JmsServerSession session, JmsQueue queue,
Long consumerId, String selector, MultiplexConnectionIfc connection,
--- 464,468 ----
*
*/
! protected Vector createReceiver
(JmsServerSession session, JmsQueue queue,
Long consumerId, String selector, MultiplexConnectionIfc connection,
***************
*** 652,656 ****
*
*/
! private Vector createPublisher(JmsServerSession session, JmsTopic topic) {
if (session != null) {
try {
--- 652,656 ----
*
*/
! protected Vector createPublisher(JmsServerSession session, JmsTopic topic) {
if (session != null) {
try {
|
|
From: <tan...@us...> - 2003-01-18 01:40:22
|
Update of /cvsroot/openjms/openjms/src/testharness/org/exolab/testharness/jms/bugs
In directory sc8-pr-cvs1:/tmp/cvs-serv24861
Modified Files:
TestBug889.java
Log Message:
Increased the timeout to wait for messages for the benefit of the http connector which occasionally wouldn't receive all messages in the 5 second timeframe
Index: TestBug889.java
===================================================================
RCS file: /cvsroot/openjms/openjms/src/testharness/org/exolab/testharness/jms/bugs/TestBug889.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestBug889.java 16 Jan 2003 13:45:13 -0000 1.4
--- TestBug889.java 18 Jan 2003 01:40:19 -0000 1.5
***************
*** 141,145 ****
receiver.setMessageListener(listener);
! Thread.currentThread().sleep(5000);
assertEquals(
--- 141,157 ----
receiver.setMessageListener(listener);
!
! // loop for a maximum of 10 seconds while we wait for
! // the receiver to receive 10 messages
! for (int index = 0; index < 100; index ++) {
! if (listener.getMessageCount() == 10) {
! break;
! } else {
! try {
! Thread.sleep(100);
! } catch (InterruptedException ignore) {
! }
! }
! }
assertEquals(
***************
*** 148,152 ****
session.rollback();
! Thread.currentThread().sleep(5000);
assertEquals(
"Listener didn't receive expected no. of messages",
--- 160,177 ----
session.rollback();
!
! // loop for a maximum of 10 seconds while we wait for
! // the receiver to receive the 10 messages again
! for (int index = 0; index < 100; index ++) {
! if (listener.getMessageCount() == 20) {
! break;
! } else {
! try {
! Thread.sleep(100);
! } catch (InterruptedException ignore) {
! }
! }
! }
!
assertEquals(
"Listener didn't receive expected no. of messages",
***************
*** 195,199 ****
subscriber.setMessageListener(listener);
! Thread.currentThread().sleep(5000);
assertEquals(
--- 220,236 ----
subscriber.setMessageListener(listener);
!
! // loop for a maximum of 10 seconds while we wait for
! // the receiver to receive the 10 messages
! for (int index = 0; index < 100; index ++) {
! if (listener.getMessageCount() == 10) {
! break;
! } else {
! try {
! Thread.sleep(100);
! } catch (InterruptedException ignore) {
! }
! }
! }
assertEquals(
***************
*** 202,206 ****
session.rollback();
! Thread.currentThread().sleep(5000);
assertEquals(
--- 239,255 ----
session.rollback();
!
! // loop for a maximum of 10 seconds while we wait for
! // the receiver to receive the 10 messages again
! for (int index = 0; index < 100; index ++) {
! if (listener.getMessageCount() == 20) {
! break;
! } else {
! try {
! Thread.sleep(100);
! } catch (InterruptedException ignore) {
! }
! }
! }
assertEquals(
|
|
From: <tan...@us...> - 2003-01-18 01:29:57
|
Update of /cvsroot/openjms/exolabcore/src/etc In directory sc8-pr-cvs1:/tmp/cvs-serv22044/src/etc Modified Files: VERSION Log Message: updated for the 0.3.4 release Index: VERSION =================================================================== RCS file: /cvsroot/openjms/exolabcore/src/etc/VERSION,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VERSION 12 Feb 2002 23:25:29 -0000 1.4 --- VERSION 18 Jan 2003 01:29:53 -0000 1.5 *************** *** 4,8 **** all.packages=org.exolab.* copyright=Exolab Inc. (C) 1999-2002. All rights reserved. www.exolab.org ! version=0.3.3 vendor.name=Exolab Inc title=Exolab Core --- 4,8 ---- all.packages=org.exolab.* copyright=Exolab Inc. (C) 1999-2002. All rights reserved. www.exolab.org ! version=0.3.4 vendor.name=Exolab Inc title=Exolab Core |
