Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for https://issues.apache.org/activemq/browse/AMQ-2038 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@728964 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2008-12-23 14:23:38 +00:00
parent 14a98e7958
commit 27cbf7b691
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
View File

@ -83,6 +83,8 @@ import org.apache.commons.logging.LogFactory;
*/ */
public class JournalPersistenceAdapter implements PersistenceAdapter, JournalEventListener, UsageListener, BrokerServiceAware { public class JournalPersistenceAdapter implements PersistenceAdapter, JournalEventListener, UsageListener, BrokerServiceAware {
private BrokerService brokerService;
protected static final Scheduler scheduler = Scheduler.getInstance(); protected static final Scheduler scheduler = Scheduler.getInstance();
private static final Log LOG = LogFactory.getLog(JournalPersistenceAdapter.class); private static final Log LOG = LogFactory.getLog(JournalPersistenceAdapter.class);
@ -599,7 +601,13 @@ public class JournalPersistenceAdapter implements PersistenceAdapter, JournalEve
*/ */
public RecordLocation writeCommand(DataStructure command, boolean sync) throws IOException { public RecordLocation writeCommand(DataStructure command, boolean sync) throws IOException {
if (started.get()) { if (started.get()) {
return journal.write(toPacket(wireFormat.marshal(command)), sync); try {
return journal.write(toPacket(wireFormat.marshal(command)), sync);
} catch (IOException ioe) {
LOG.error("Cannot write to the journal", ioe);
stopBroker();
throw ioe;
}
} }
throw new IOException("closed"); throw new IOException("closed");
} }
@ -693,10 +701,23 @@ public class JournalPersistenceAdapter implements PersistenceAdapter, JournalEve
} }
public void setBrokerService(BrokerService brokerService) { public void setBrokerService(BrokerService brokerService) {
this.brokerService = brokerService;
PersistenceAdapter pa = getLongTermPersistence(); PersistenceAdapter pa = getLongTermPersistence();
if( pa instanceof BrokerServiceAware ) { if( pa instanceof BrokerServiceAware ) {
((BrokerServiceAware)pa).setBrokerService(brokerService); ((BrokerServiceAware)pa).setBrokerService(brokerService);
} }
} }
protected void stopBroker() {
new Thread() {
public void run() {
try {
brokerService.stop();
} catch (Exception e) {
LOG.warn("Failure occured while stopping broker");
}
}
}.start();
}
} }