Author: rhs
Date: Mon Feb 4 13:06:35 2008
New Revision: 618437
URL: http://svn.apache.org/viewvc?rev=618437&view=rev
Log:
added exception callback to ConnectonDelegate
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Connection.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Echo.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Receiver.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
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=618437&r1=618436&r2=618437&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
Mon Feb 4 13:06:35 2008
@@ -54,6 +54,11 @@
return new ClientSessionDelegate();
}
+ public void exception(Throwable t)
+ {
+ // XXX: need to propogate exception
+ }
+
@Override public void connectionClose(Channel context,
ConnectionClose connectionClose)
{
ErrorCode errorCode =
ErrorCode.get(connectionClose.getReplyCode());
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyBroker.java
Mon Feb 4 13:06:35 2008
@@ -272,6 +272,10 @@
{
return new ToyBroker(exchange);
}
+ public void exception(Throwable t)
+ {
+ t.printStackTrace();
+ }
};
//hack
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
Mon Feb 4 13:06:35 2008
@@ -69,6 +69,10 @@
{
return new ToyClient();
}
+ public void
exception(Throwable t)
+ {
+ t.printStackTrace();
+ }
});
conn.send(new ConnectionEvent(0, new ProtocolHeader(1, 0, 10)));
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Channel.java
Mon Feb 4 13:06:35 2008
@@ -114,6 +114,11 @@
throw new RuntimeException(error.getMessage());
}
+ public void exception(Throwable t)
+ {
+ session.exception(t);
+ }
+
public void closed()
{
log.debug("channel closed: ", 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=618437&r1=618436&r2=618437&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
Mon Feb 4 13:06:35 2008
@@ -110,6 +110,11 @@
}
}
+ public void exception(Throwable t)
+ {
+ delegate.exception(t);
+ }
+
public void closed()
{
log.debug("connection closed: %s", this);
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/ConnectionDelegate.java
Mon Feb 4 13:06:35 2008
@@ -67,6 +67,8 @@
public abstract SessionDelegate getSessionDelegate();
+ public abstract void exception(Throwable t);
+
public void setCondition(Lock negotiationCompleteLock,Condition
negotiationComplete)
{
_negotiationComplete = negotiationComplete;
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Echo.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Echo.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Echo.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Echo.java
Mon Feb 4 13:06:35 2008
@@ -70,6 +70,10 @@
{
return new Echo();
}
+ public void exception(Throwable t)
+ {
+ t.printStackTrace();
+ }
};
//hack
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Receiver.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Receiver.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Receiver.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Receiver.java
Mon Feb 4 13:06:35 2008
@@ -31,6 +31,8 @@
void received(T msg);
+ void exception(Throwable t);
+
void closed();
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
Mon Feb 4 13:06:35 2008
@@ -399,6 +399,11 @@
// XXX: channel.close();
}
+ public void exception(Throwable t)
+ {
+ log.error(t, "caught exception");
+ }
+
public void closed()
{
closed.set(true);
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
Mon Feb 4 13:06:35 2008
@@ -99,6 +99,11 @@
event.delegate(this);
}
+ public void exception(Throwable t)
+ {
+ this.receiver.exception(t);
+ }
+
public void closed()
{
this.receiver.closed();
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java
Mon Feb 4 13:06:35 2008
@@ -245,6 +245,11 @@
}
}
+ public void exception(Throwable t)
+ {
+ receiver.exception(t);
+ }
+
public void closed()
{
receiver.closed();
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java?rev=618437&r1=618436&r2=618437&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
Mon Feb 4 13:06:35 2008
@@ -81,8 +81,8 @@
public void exceptionCaught(IoSession ssn, Throwable e)
{
- log.error(e, "exception caught");
- throw new RuntimeException("IOException", e);
+ Attachment<E> attachment = (Attachment<E>) ssn.getAttachment();
+ attachment.receiver.exception(e);
}
public void sessionCreated(final IoSession ssn)
