Merge branch 'master' of https://github.com/gresrun/jesque

gresrun · Nov 18, 2013 · 77df250 · 77df250
2 parents 0cf4a4e + 1c6c1b2
commit 77df250
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/net/greghaines/jesque/meta/dao/impl/WorkerInfoDAORedisImpl.java b/src/main/java/net/greghaines/jesque/meta/dao/impl/WorkerInfoDAORedisImpl.java
@@ -238,6 +238,8 @@ private boolean isWorkerInState(final String workerName, final WorkerInfo.State
                 if (statusPayload != null) {
                     final WorkerStatus status = ObjectMapperFactory.get().readValue(statusPayload, WorkerStatus.class);
                     proceed = !status.isPaused();
+                } else {
+                    proceed = false;
                 }
                 break;
             default:

diff --git a/src/main/java/net/greghaines/jesque/worker/WorkerImpl.java b/src/main/java/net/greghaines/jesque/worker/WorkerImpl.java
@@ -173,9 +173,9 @@ public WorkerImpl(final Config config, final Collection<String> queues,
         this.namespace = config.getNamespace();
         this.jedis = new Jedis(config.getHost(), config.getPort(), config.getTimeout());
         authenticateAndSelectDB();
-        this.name = createName();
         setQueues(queues);
         setJobTypes(jobTypes);
+        this.name = createName();
     }
 
     /**