summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Liebig2008-03-14 03:00:46 (EDT)
committerStefan Liebig2008-03-14 03:00:46 (EDT)
commit0d8b60fc0fd500beb9446c1d87ced128f7883fa1 (patch)
tree4ba39b62516a72bb9029932290e3b4f9e01807ff
parent3c1257f77e0da5fefce864c0d6bdce292962da1e (diff)
downloadorg.eclipse.riena-0d8b60fc0fd500beb9446c1d87ced128f7883fa1.zip
org.eclipse.riena-0d8b60fc0fd500beb9446c1d87ced128f7883fa1.tar.gz
org.eclipse.riena-0d8b60fc0fd500beb9446c1d87ced128f7883fa1.tar.bz2
guard against null configuration
-rw-r--r--org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/ssl/SSLConfiguration.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/ssl/SSLConfiguration.java b/org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/ssl/SSLConfiguration.java
index 5cf653b..421fee5 100644
--- a/org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/ssl/SSLConfiguration.java
+++ b/org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/ssl/SSLConfiguration.java
@@ -64,14 +64,18 @@ public class SSLConfiguration {
public void configure(ISSLProperties properties) {
configured = false;
- protocol = properties.getProtocol();
- keystore = properties.getKeystore();
- password = properties.getPassword();
-
LOGGER
.log(LogService.LOG_INFO, "Configuring SSL protocol '" + protocol + "' with keystore '" + keystore
+ "'.");
+ if (properties == null) {
+ LOGGER.log(LogService.LOG_INFO, "No configuration given!.");
+ return;
+ }
+ protocol = properties.getProtocol();
+ keystore = properties.getKeystore();
+ password = properties.getPassword();
+
// Check protocol & keystore
if (keystore == null || keystore.length() == 0 || protocol == null || protocol.length() == 0) {
// no keystore configured. Apparently no SSL used in this context.