sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-whiteboard] 04/04: SLING-6585 - Switch to the ASF code signing service
Date Tue, 16 Jan 2018 10:56:08 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git

commit 68a0d979461d70cbc5d003d88c9dca19065b95e0
Author: Robert Munteanu <rombert@apache.org>
AuthorDate: Mon Jan 15 18:45:11 2018 +0200

    SLING-6585 - Switch to the ASF code signing service
    
    Fix a NPE when the codesign.sslDebug property is enabled.
---
 .../src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/codesign/src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java b/codesign/src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java
index b3ff3d0..4bbd62f 100644
--- a/codesign/src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java
+++ b/codesign/src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java
@@ -206,7 +206,11 @@ public class SignCodeMojo extends AbstractMojo {
             throw new MojoExecutionException("Signing failed : " + e.getMessage(), e);
         } finally {
             if ( sslDebug ) {
-                System.setProperty("javax.net.debug", oldSslDebug);
+                if ( oldSslDebug != null ) {
+                    System.setProperty("javax.net.debug", oldSslDebug);
+                } else {
+                    System.clearProperty("javax.net.debug");
+                }
             }
         }
     }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message