Author: gmazza
Date: Fri Aug 16 19:38:10 2013
New Revision: 1514866
URL: http://svn.apache.org/r1514866
Log:
Move WorkerThread cleanup into a finish block.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java?rev=1514866&r1=1514865&r2=1514866&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
Fri Aug 16 19:38:10 2013
@@ -86,7 +86,7 @@ public class HitCountQueue {
public void processHit(Weblog weblog, String url, String referrer) {
- // if the weblog isn't null then just drop it's handle in the queue
+ // if the weblog isn't null then just drop its handle in the queue
// each entry in the queue is a weblog handle and indicates a single
hit
if(weblog != null) {
this.queue.add(weblog.getHandle());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java?rev=1514866&r1=1514865&r2=1514866&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
Fri Aug 16 19:38:10 2013
@@ -46,7 +46,7 @@ import org.apache.roller.weblogger.confi
* roller.properties configuration file.
*
* In asynchronous processing mode we start some number of worker threads which
- * run continously to process any referrers that have been queued. Each worker
+ * run continuously to process any referrers that have been queued. Each
worker
* processes queued referrers until the queue is empty, then sleeps for a given
* amount of time. The number of workers used and their sleep time can be set
* via properties of the static roller.properties file.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java?rev=1514866&r1=1514865&r2=1514866&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
Fri Aug 16 19:38:10 2013
@@ -71,11 +71,11 @@ public class WorkerThread extends Thread
log.error("Error executing job. "+
"Worker = "+this.id+", "+
"Job = "+this.job.getClass().getName(), e);
+ } finally {
+ // since this is a thread we have to make sure that we tidy up
ourselves
+ Weblogger roller = WebloggerFactory.getWeblogger();
+ roller.release();
}
-
- // since this is a thread we have to make sure that we tidy up
ourselves
- Weblogger roller = WebloggerFactory.getWeblogger();
- roller.release();
}
}
