[spring-extensions] branch master updated: Add annotations.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=6e4aa4a3f7087bb5ef1f11298872183c825b738e

The following commit(s) were added to refs/heads/master by this push:
       new  6e4aa4a   Add annotations.
6e4aa4a is described below

commit 6e4aa4a3f7087bb5ef1f11298872183c825b738e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Oct 3 20:26:24 2016 -0400

    Add annotations.
---
 .../ext/spring/service/AbstractServiceableComponent.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java b/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
index d73615f..a9538c3 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
@@ -43,17 +43,22 @@ public abstract class AbstractServiceableComponent<T> extends AbstractIdentified
         ServiceableComponent<T>, ApplicationContextAware {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractServiceableComponent.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(AbstractServiceableComponent.class);
 
     /** The context used to load this bean. */
-    private ApplicationContext applicationContext;
+    @Nullable private ApplicationContext applicationContext;
 
     /**
      * Lock for this service. We make it unfair since we will control access and there will only ever be contention
      * during unload.
      */
-    private final ReentrantReadWriteLock serviceLock = new ReentrantReadWriteLock(false);
+    @Nonnull private final ReentrantReadWriteLock serviceLock;
 
+    /** Constructor. */
+    public AbstractServiceableComponent() {
+        serviceLock = new ReentrantReadWriteLock(false);
+    }
+    
     /** {@inheritDoc} */
     @Override public void setApplicationContext(final ApplicationContext context) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
@@ -131,4 +136,5 @@ public abstract class AbstractServiceableComponent<T> extends AbstractIdentified
                     + ": Application context did not implement ConfigurableApplicationContext");
         }
     }
-}
+
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.