commit 4b29b1dd1843ac90874af87c5252801eab0ec0f4
author kwangin <inylove82@gmail.com> Mon Oct 09 12:35:42 2017 +0900
committer csterling <coreytsterling@gmail.com> Tue Nov 26 09:25:19 2019 +1300
tree 94ad31730a2cf9bea8f5f2aff89767c735810ed4
parent b4a9709d2b329149abac000427666a3a852f4890

Fix samoa-strom properties file path

samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormJarSubmitter.java

diff --git a/samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormJarSubmitter.java b/samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormJarSubmitter.java
index a3de798..0503a5c 100644
--- a/samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormJarSubmitter.java
+++ b/samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormJarSubmitter.java
@@ -66,7 +66,7 @@
     Properties props = StormSamoaUtils.getProperties();
     props.setProperty(StormJarSubmitter.UPLOADED_JAR_LOCATION_KEY, uploadedJarLocation);
 
-    File f = new File("src/main/resources/samoa-storm-cluster.properties");
+    File f = new File("../bin/samoa-storm.properties");
     f.createNewFile();
 
     OutputStream out = new FileOutputStream(f);

samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormSamoaUtils.java

diff --git a/samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormSamoaUtils.java b/samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormSamoaUtils.java
index 7f7e578..6f7d50e 100644
--- a/samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormSamoaUtils.java
+++ b/samoa-storm/src/main/java/org/apache/samoa/topology/impl/StormSamoaUtils.java
@@ -52,18 +52,20 @@
 
   static Properties getProperties() throws IOException {
     Properties props = new Properties();
-    InputStream is;
+    InputStream is = null;
 
-    File f = new File("src/main/resources/samoa-storm-cluster.properties"); // FIXME it does not exist anymore
-    is = new FileInputStream(f);
+    File f = new File("../bin/samoa-storm.properties");
 
     try {
+      is = new FileInputStream(f);
       props.load(is);
     } catch (IOException e1) {
-      System.out.println("Fail to load property file");
+      System.out.println("Fail to load samoa-storm property file");
       return null;
     } finally {
-      is.close();
+      if (is != null) {
+        is.close();
+      }
     }
 
     return props;