[java-support] branch master updated: JSPT-65 - AbstractReloadableService logs null service ID

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-support.

View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=9e562b5078d41d2a46af1d4ff2e5b69c8ef5c54b

The following commit(s) were added to refs/heads/master by this push:
       new  9e562b5   JSPT-65 - AbstractReloadableService logs null service ID
9e562b5 is described below

commit 9e562b5078d41d2a46af1d4ff2e5b69c8ef5c54b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 11 10:03:28 2016 -0400

    JSPT-65 - AbstractReloadableService logs null service ID
    
    https://issues.shibboleth.net/jira/browse/JSPT-65
---
 .../java/support/service/AbstractReloadableService.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java b/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
index 902f20d..33190b3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/service/AbstractReloadableService.java
@@ -267,10 +267,14 @@ public abstract class AbstractReloadableService<T> extends AbstractIdentifiableI
         // local cache of cached entry to allow unsynchronized clearing of per class cache.
         String prefix = logPrefix;
         if (null == prefix) {
-            final StringBuilder builder = new StringBuilder("Service '").append(getId()).append("':");
-            prefix = builder.toString();
-            if (null == logPrefix) {
-                logPrefix = prefix;
+            if (getId() != null) {
+                final StringBuilder builder = new StringBuilder("Service '").append(getId()).append("':");
+                prefix = builder.toString();
+                if (null == logPrefix) {
+                    logPrefix = prefix;
+                }
+            } else {
+                prefix = "Service:";
             }
         }
         return prefix;

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