diff options
| author | Simon Rettberg | 2017-03-02 19:05:14 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-03-02 19:05:14 +0100 |
| commit | e5079464d0c7c3b2c2d7b8b7fe10dbc0aee31e30 (patch) | |
| tree | 48eee435fac6f02ace674e38f5019263eb6db24f | |
| parent | [CreateLdapConfig] Add shareDomain and credentialPassthrough (diff) | |
| download | tmlite-bwlp-e5079464d0c7c3b2c2d7b8b7fe10dbc0aee31e30.tar.gz tmlite-bwlp-e5079464d0c7c3b2c2d7b8b7fe10dbc0aee31e30.tar.xz tmlite-bwlp-e5079464d0c7c3b2c2d7b8b7fe10dbc0aee31e30.zip | |
[LighttpdHttps] fix NPE when importing certificate
d4ccf048ac965360c4d8cda1541cc924eee72570 broke it by reordering
lines in a nonsensical way.
| -rw-r--r-- | src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java index 2829baf..59f3027 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java +++ b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java @@ -62,16 +62,16 @@ public class LighttpdHttps extends AbstractTask File tmpChain = null; try { try { + tmpCert = File.createTempFile( "bwlp-", ".pem" ); tmpKey = File.createTempFile( "bwlp-", ".pem" ); Util.writeStringToFile( tmpCert, this.importcert ); - tmpCert = File.createTempFile( "bwlp-", ".pem" ); Util.writeStringToFile( tmpKey, this.importkey ); if ( this.importchain != null && !this.importchain.isEmpty() ) { tmpChain = File.createTempFile( "bwlp-", ".pem" ); Util.writeStringToFile( tmpChain, this.importchain ); } } catch ( Exception e ) { - status.error = "Could not create temporary files!"; + status.error = "Could not create temporary files: " + e.getMessage(); return false; } int ret; |