[OODT-1031] Fixed a possible NPE occurred when workflow properties file not found.
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/RpcCommunicationFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/RpcCommunicationFactory.java
index 2759b8c..dfc147b 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/RpcCommunicationFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/RpcCommunicationFactory.java
@@ -82,10 +82,15 @@
String propertiesFile = System.getProperty(WorkflowManager.PROPERTIES_FILE_PROPERTY, WorkflowManager.DEFAULT_PROPERTIES_FILE);
InputStream prpFileStream = RpcCommunicationFactory.class.getResourceAsStream(propertiesFile);
Properties properties = new Properties();
- try {
- properties.load(prpFileStream);
- } catch (IOException e) {
- logger.error("An error occurred when loading properties file: {}", propertiesFile, e);
+
+ if (prpFileStream != null) {
+ try {
+ properties.load(prpFileStream);
+ } catch (IOException e) {
+ logger.error("An error occurred when loading properties file: {}", propertiesFile, e);
+ }
+ } else {
+ logger.warn("Properties file: '{}' could not be found. Skipped loading properties", propertiesFile);
}
return properties;
