Author: norman
Date: Fri Nov 19 14:09:52 2010
New Revision: 1036851
URL: http://svn.apache.org/viewvc?rev=1036851&view=rev
Log:
Check if session is null before try to rollback
Modified:
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
Modified:
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java?rev=1036851&r1=1036850&r2=1036851&view=diff
==============================================================================
---
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
(original)
+++
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
Fri Nov 19 14:09:52 2010
@@ -130,10 +130,12 @@ public class JMSMailQueue implements Man
}
} catch (Exception e) {
- try {
- session.rollback();
- } catch (JMSException e1) {
- // ignore on rollback
+ if (session != null) {
+ try {
+ session.rollback();
+ } catch (JMSException e1) {
+ // ignore on rollback
+ }
}
if (consumer != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
