[java-opensaml COMMIT] in /trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl: BasicSignatureSigningCo...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr  2 12:02:29 2014
New Revision: 3757

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3757&view=rev
Log:
Fix some NPEs

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java?rev=3757&r1=3756&r2=3757&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java Wed Apr  2 12:02:29 2014
@@ -48,28 +48,28 @@
         implements SignatureSigningConfiguration {
     
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(BasicSignatureSigningConfiguration.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(BasicSignatureSigningConfiguration.class);
     
     /** Signing credentials. */
-    private List<Credential> signingCredentials;
+    @Nonnull @NonnullElements private List<Credential> signingCredentials;
     
     /** Signature method algorithm URIs. */
-    private List<String> signatureAlgorithms;
+    @Nonnull @NonnullElements private List<String> signatureAlgorithms;
     
     /** Digest method algorithm URIs. */
-    private List<String> signatureReferenceDigestMethods;
+    @Nonnull @NonnullElements private List<String> signatureReferenceDigestMethods;
     
     /** Signature canonicalization algorithm URI. */
-    private String signatureCanonicalization;
+    @Nullable private String signatureCanonicalization;
     
     /** Signature HMAC output length. */
-    private Integer signatureHMACOutputLength;
+    @Nullable private Integer signatureHMACOutputLength;
     
     /** Manager for named KeyInfoGenerator instances. */
-    private NamedKeyInfoGeneratorManager keyInfoGeneratorManager;
+    @Nullable private NamedKeyInfoGeneratorManager keyInfoGeneratorManager;
     
     /** Default DSA key family parameters. */
-    private final Map<Integer, DSAParams> dsaParams;
+    @Nonnull @NonnullElements private final Map<Integer, DSAParams> dsaParams;
     
     //TODO chaining to parent config instance on getters? or use a wrapping proxy, etc?
     
@@ -77,10 +77,10 @@
     
     /** Constructor. */
     public BasicSignatureSigningConfiguration() {
-        super();
         signingCredentials = Collections.emptyList();
         signatureAlgorithms = Collections.emptyList();
-        dsaParams = new HashMap<Integer, DSAParams>();
+        signatureReferenceDigestMethods = Collections.emptyList();
+        dsaParams = new HashMap<>();
     }
     
     /** {@inheritDoc} */

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java?rev=3757&r1=3756&r2=3757&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java Wed Apr  2 12:02:29 2014
@@ -91,12 +91,12 @@
         
         params.setSignatureCanonicalizationAlgorithm(resolveCanonicalizationAlgorithm(criteria));
         
-        params.setKeyInfoGenerator(resolveKeyInfoGenerator(criteria, params.getSigningCredential()));
-        
-        params.setSignatureHMACOutputLength(resolveHMACOutputLength(criteria, params.getSigningCredential(), 
-                params.getSignatureAlgorithmURI()));
-        
-        params.setDSAParams(resolveDSAParams(criteria, params.getSigningCredential()));
+        if (params.getSigningCredential() != null) {
+            params.setKeyInfoGenerator(resolveKeyInfoGenerator(criteria, params.getSigningCredential()));
+            params.setSignatureHMACOutputLength(resolveHMACOutputLength(criteria, params.getSigningCredential(), 
+                    params.getSignatureAlgorithmURI()));
+            params.setDSAParams(resolveDSAParams(criteria, params.getSigningCredential()));
+        }
         
         validate(params);