From 3e4b6ff2f9438d50c4f2d1b1b292daa896b702a3 Mon Sep 17 00:00:00 2001 From: Jason Ye Date: Mon, 23 Sep 2013 14:37:02 -0700 Subject: [PATCH] Minor log msg changes Change-Id: I289d031ff8157d1c0652d8471d4e5f017188dcf9 Signed-off-by: Jason Ye --- .../openflow/core/internal/Controller.java | 4 ++-- .../core/internal/SecureMessageReadWriteService.java | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/Controller.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/Controller.java index 172ec98780..72ee7a679b 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/Controller.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/Controller.java @@ -356,12 +356,12 @@ public class Controller implements IController, CommandProvider, IPluginInConnec String keyStoreFile = System.getProperty("controllerKeyStore"); String trustStoreFile = System.getProperty("controllerTrustStore"); if ((keyStoreFile == null) || keyStoreFile.trim().isEmpty()) { - ci.print("controllerKeyStore not specified in ./configuration/config.ini\n"); + ci.print("controllerKeyStore not specified\n"); } else { ci.print("controllerKeyStore=" + keyStoreFile + "\n"); } if ((trustStoreFile == null) || trustStoreFile.trim().isEmpty()) { - ci.print("controllerTrustStore not specified in ./configuration/config.ini\n"); + ci.print("controllerTrustStore not specified\n"); } else { ci.print("controllerTrustStore=" + trustStoreFile + "\n"); } diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SecureMessageReadWriteService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SecureMessageReadWriteService.java index 1a9dfdad95..316526fefa 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SecureMessageReadWriteService.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SecureMessageReadWriteService.java @@ -88,29 +88,25 @@ public class SecureMessageReadWriteService implements IMessageReadWrite { keyStoreFile = keyStoreFile.trim(); } if ((keyStoreFile == null) || keyStoreFile.isEmpty()) { - throw new FileNotFoundException( - "controllerKeyStore not specified in ./configuration/config.ini"); + throw new FileNotFoundException("TLS KeyStore file not found."); } if (keyStorePassword != null) { keyStorePassword = keyStorePassword.trim(); } if ((keyStorePassword == null) || keyStorePassword.isEmpty()) { - throw new FileNotFoundException( - "controllerKeyStorePassword not specified in ./configuration/config.ini"); + throw new FileNotFoundException("TLS KeyStore Password not provided."); } if (trustStoreFile != null) { trustStoreFile = trustStoreFile.trim(); } if ((trustStoreFile == null) || trustStoreFile.isEmpty()) { - throw new FileNotFoundException( - "controllerTrustStore not specified in ./configuration/config.ini"); + throw new FileNotFoundException("TLS TrustStore file not found"); } if (trustStorePassword != null) { trustStorePassword = trustStorePassword.trim(); } if ((trustStorePassword == null) || trustStorePassword.isEmpty()) { - throw new FileNotFoundException( - "controllerTrustStorePassword not specified in ./configuration/config.ini"); + throw new FileNotFoundException("TLS TrustStore Password not provided."); } KeyStore ks = KeyStore.getInstance("JKS"); -- 2.36.6