usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdun...@apache.org
Subject [4/4] usergrid git commit: Merge branch '9f45130_lock_mgr_fix' into release-2.1.1
Date Fri, 08 Apr 2016 17:02:55 GMT
Merge branch '9f45130_lock_mgr_fix' into release-2.1.1


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e0a99524
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e0a99524
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e0a99524

Branch: refs/heads/release-2.1.1
Commit: e0a995243a9edd7e7efd81922ffe36be1f14ea5b
Parents: 4326b10 b855728
Author: Mike Dunker <mdunker@apigee.com>
Authored: Fri Apr 8 08:55:16 2016 -0700
Committer: Mike Dunker <mdunker@apigee.com>
Committed: Fri Apr 8 08:55:16 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/usergrid/batch/job/OnlyOnceJob.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/e0a99524/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
index 82e856d,ac56c7b..9b1fb05
--- a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
+++ b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
@@@ -58,9 -62,13 +62,13 @@@ public abstract class OnlyOnceJob imple
      @PostConstruct
      public void initLockManager() throws Exception {
          this.lockManager = injector.getInstance(LockManager.class);
 -        if (lockManager != null) {
++        if (this.lockManager != null) {
+             logger.info("LockManager injection successful");
+         } else {
+             logger.error("LockManager injection unsuccessful");
+         }
      }
  
- 
      /*
       * (non-Javadoc)
       *


Mime
View raw message