[java-identity-provider COMMIT] /trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateA...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 18 21:38:33 2014
New Revision: 6444

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6444&view=rev
Log:
IDP-375 - Stop exporting empty collections.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java?rev=6444&r1=6443&r2=6444&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java Mon Aug 18 21:38:33 2014
@@ -203,16 +203,18 @@
             
             final Object values = entry.getValue().apply(profileRequestContext);
             if (values != null) {
-                if (values instanceof Collection && !((Collection) values).isEmpty()) {
-                    log.debug("{} Adding {} value(s) for field '{}'", getLogPrefix(), ((Collection) values).size(),
-                            entry.getKey());
-                    for (final Object value : (Collection) values) {
-                        if (value != null) {
-                            if (value instanceof DateTime) {
-                                auditCtx.getFieldValues(entry.getKey()).add(((DateTime) value).toString(
-                                        dateTimeFormat));
-                            } else {
-                                auditCtx.getFieldValues(entry.getKey()).add(value.toString());
+                if (values instanceof Collection) {
+                    if (!((Collection) values).isEmpty()) {
+                        log.debug("{} Adding {} value(s) for field '{}'", getLogPrefix(), ((Collection) values).size(),
+                                entry.getKey());
+                        for (final Object value : (Collection) values) {
+                            if (value != null) {
+                                if (value instanceof DateTime) {
+                                    auditCtx.getFieldValues(entry.getKey()).add(((DateTime) value).toString(
+                                            dateTimeFormat));
+                                } else {
+                                    auditCtx.getFieldValues(entry.getKey()).add(value.toString());
+                                }
                             }
                         }
                     }