Author: rajith
Date: Wed Feb 6 14:36:02 2008
New Revision: 619189
URL: http://svn.apache.org/viewvc?rev=619189&view=rev
Log:
Added code to pass in the throwable to the closedListener so that it can be
included in the JMS Exception thrown via the ExceptionListener
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/njms/SessionImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
Wed Feb 6 14:36:02 2008
@@ -142,12 +142,17 @@
}
- public void onClosed(ErrorCode errorCode, String reason)
+ public void onClosed(ErrorCode errorCode, String reason, Throwable t)
{
if (_logger.isDebugEnabled())
{
_logger.debug("Received a connection close from the broker: Error
code : " + errorCode.getCode());
}
- _conn._exceptionListener.onException(new
JMSException(reason,String.valueOf(errorCode.getCode())));
+ JMSException ex = new
JMSException(reason,String.valueOf(errorCode.getCode()));
+ if (t != null)
+ {
+ ex.initCause(t);
+ }
+ _conn._exceptionListener.onException(ex);
}
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
Wed Feb 6 14:36:02 2008
@@ -592,7 +592,7 @@
*/
private class QpidSessionExceptionListener implements
org.apache.qpidity.nclient.ClosedListener
{
- public void onClosed(ErrorCode errorCode, String reason)
+ public void onClosed(ErrorCode errorCode, String reason, Throwable t)
{
synchronized (this)
{
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
Wed Feb 6 14:36:02 2008
@@ -58,9 +58,11 @@
public void exception(Throwable t)
{
+ System.out.println("notifying listener");
if (_closedListner != null)
{
-
_closedListner.onClosed(ErrorCode.CONNECTION_ERROR,ErrorCode.CONNECTION_ERROR.getDesc());
+ System.out.println("notifying listener2");
+
_closedListner.onClosed(ErrorCode.CONNECTION_ERROR,ErrorCode.CONNECTION_ERROR.getDesc(),t);
}
else
{
@@ -70,9 +72,10 @@
public void closed()
{
+ System.out.println("notifying listener");
if (_closedListner != null && !this.receivedClose)
{
-
_closedListner.onClosed(ErrorCode.CONNECTION_ERROR,ErrorCode.CONNECTION_ERROR.getDesc());
+
_closedListner.onClosed(ErrorCode.CONNECTION_ERROR,ErrorCode.CONNECTION_ERROR.getDesc(),null);
}
}
@@ -89,7 +92,7 @@
}
else
{
- _closedListner.onClosed(errorCode,
connectionClose.getReplyText());
+ _closedListner.onClosed(errorCode,
connectionClose.getReplyText(),null);
}
this.receivedClose = true;
@@ -103,6 +106,7 @@
if (System.getProperty("transport","mina").equalsIgnoreCase("nio"))
{
+ System.out.println("Using NIO");
if( _logger.isDebugEnabled())
{
_logger.debug("using NIO");
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/ClosedListener.java
Wed Feb 6 14:36:02 2008
@@ -32,8 +32,8 @@
* informs the connection's ExceptionListener
* @param errorCode TODO
* @param reason TODO
- *
+ * @param t TODO
* @see Connection
*/
- public void onClosed(ErrorCode errorCode, String reason);
+ public void onClosed(ErrorCode errorCode, String reason, Throwable t);
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/JMSTestCase.java
Wed Feb 6 14:36:02 2008
@@ -1,5 +1,7 @@
package org.apache.qpidity.nclient;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
@@ -16,17 +18,17 @@
try
{
- javax.jms.Connection con = new
AMQConnection("qpid:password=guest;username=guest;client_id=clientid;[EMAIL
PROTECTED]:127.0.0.1:5672");
+ javax.jms.Connection con = new
AMQConnection("qpid:password=pass;[EMAIL PROTECTED]:localhost:5672");
con.start();
javax.jms.Session ssn = con.createSession(false, 1);
javax.jms.Destination dest = new AMQQueue(new
AMQShortString("direct"),"test");
javax.jms.MessageConsumer cons = ssn.createConsumer(dest);
- javax.jms.MessageProducer prod = ssn.createProducer(dest);
+ //javax.jms.MessageProducer prod = ssn.createProducer(dest);
- //javax.jms.TextMessage m = (javax.jms.TextMessage)cons.receive();
- /* cons.setMessageListener(new MessageListener()
+ javax.jms.TextMessage m = null; //
(javax.jms.TextMessage)cons.receive();
+ cons.setMessageListener(new MessageListener()
{
public void onMessage(Message m)
{
@@ -41,9 +43,25 @@
}
}
- });*/
+ });
- javax.jms.TextMessage msg = ssn.createTextMessage();
+ con.setExceptionListener(new ExceptionListener()
+ {
+ public void onException(JMSException e)
+ {
+ e.printStackTrace();
+ }
+ });
+
+ System.out.println("Waiting");
+ while (m == null)
+ {
+
+ }
+
+ System.out.println("Exiting");
+
+ /*javax.jms.TextMessage msg = ssn.createTextMessage();
msg.setText("This is a test message");
msg.setBooleanProperty("targetMessage", false);
prod.send(msg);
@@ -60,7 +78,7 @@
else
{
System.out.println("message is not null" + m);
- }
+ }*/
}
catch(Exception e)
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java
Wed Feb 6 14:36:02 2008
@@ -189,7 +189,7 @@
void notifyException(QpidException ex)
{
- _exceptionListner.onClosed(null, null);
+ _exceptionListner.onClosed(null, null, null);
}
Map<String,MessagePartListener> getMessageListerners()
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/DemoClient.java
Wed Feb 6 14:36:02 2008
@@ -40,7 +40,7 @@
Session ssn = conn.createSession(50000);
ssn.setClosedListener(new ClosedListener()
{
- public void onClosed(ErrorCode errorCode, String reason)
+ public void onClosed(ErrorCode errorCode, String reason,
Throwable t)
{
System.out.println("ErrorCode : " + errorCode + "
reason : " + reason);
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/impl/LargeMsgDemoClient.java
Wed Feb 6 14:36:02 2008
@@ -43,7 +43,7 @@
Session ssn = conn.createSession(50000);
ssn.setClosedListener(new ClosedListener()
{
- public void onClosed(ErrorCode errorCode, String reason)
+ public void onClosed(ErrorCode errorCode, String reason,
Throwable t)
{
System.out.println("ErrorCode : " + errorCode + "
reason : " + reason);
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/interop/BasicInteropTest.java
Wed Feb 6 14:36:02 2008
@@ -124,7 +124,7 @@
session.sync();
}
- public void onClosed(ErrorCode errorCode, String reason)
+ public void onClosed(ErrorCode errorCode, String reason, Throwable t)
{
System.out.println("------- Broker Notified an error --------");
System.out.println("------- " + errorCode + " --------");
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/njms/SessionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/njms/SessionImpl.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/njms/SessionImpl.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/njms/SessionImpl.java
Wed Feb 6 14:36:02 2008
@@ -1163,7 +1163,7 @@
*/
private class QpidSessionExceptionListener implements
org.apache.qpidity.nclient.ClosedListener
{
- public void onClosed(ErrorCode errorCode, String reason)
+ public void onClosed(ErrorCode errorCode, String reason, Throwable t)
{
synchronized (this)
{
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java?rev=619189&r1=619188&r2=619189&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
Wed Feb 6 14:36:02 2008
@@ -77,7 +77,7 @@
public void received(ConnectionEvent event)
{
- log.debug("RECV: %s", event);
+ log.debug("RECV: %s", event);
Channel channel = getChannel(event.getChannel());
channel.received(event.getProtocolEvent());
}
