Author: ritchiem
Date: Tue Mar 3 18:59:04 2009
New Revision: 749697
URL: http://svn.apache.org/viewvc?rev=749697&view=rev
Log:
Prevent NullPointerException when backing store file is deleted externally
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java?rev=749697&r1=749696&r2=749697&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FileQueueBackingStore.java
Tue Mar 3 18:59:04 2009
@@ -245,14 +245,18 @@
}
finally
{
- try
+ // In a FileNotFound situation writer will be null.
+ if (writer != null)
{
- writer.flush();
- writer.close();
- }
- catch (IOException e)
- {
- error = e;
+ try
+ {
+ writer.flush();
+ writer.close();
+ }
+ catch (IOException e)
+ {
+ error = e;
+ }
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
