Merge branch 'hotfix/0.12.1'

lmco · Jun 10, 2015 · b4681dd · b4681dd
2 parents 9a69bcd + b579d43
commit b4681dd
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>streamflow</groupId>
     <artifactId>streamflow</artifactId>
-    <version>0.12.0</version>
+    <version>0.12.1</version>
     <packaging>pom</packaging>
 
     <name>StreamFlow</name>

diff --git a/streamflow-annotations/pom.xml b/streamflow-annotations/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-annotations</artifactId>

diff --git a/streamflow-core/pom.xml b/streamflow-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-core</artifactId>

diff --git a/streamflow-core/streamflow-app/pom.xml b/streamflow-core/streamflow-app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-app</artifactId>

diff --git a/streamflow-core/streamflow-app/streamflow-app-jar/pom.xml b/streamflow-core/streamflow-app/streamflow-app-jar/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-app</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-app-jar</artifactId>

diff --git a/streamflow-core/streamflow-app/streamflow-app-war/pom.xml b/streamflow-core/streamflow-app/streamflow-app-war/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-app</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-app-war</artifactId>

diff --git a/streamflow-core/streamflow-datastore/pom.xml b/streamflow-core/streamflow-datastore/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-datastore</artifactId>

diff --git a/streamflow-core/streamflow-datastore/streamflow-datastore-core/pom.xml b/streamflow-core/streamflow-datastore/streamflow-datastore-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-datastore</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-datastore-core</artifactId>

diff --git a/streamflow-core/streamflow-datastore/streamflow-datastore-jdbc/pom.xml b/streamflow-core/streamflow-datastore/streamflow-datastore-jdbc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-datastore</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-datastore-jdbc</artifactId>

diff --git a/streamflow-core/streamflow-datastore/streamflow-datastore-mongodb/pom.xml b/streamflow-core/streamflow-datastore/streamflow-datastore-mongodb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-datastore</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-datastore-mongodb</artifactId>

diff --git a/streamflow-core/streamflow-engine/pom.xml b/streamflow-core/streamflow-engine/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-engine</artifactId>

diff --git a/...ow-core/streamflow-engine/src/main/java/streamflow/engine/topology/TopologySubmitter.java b/...ow-core/streamflow-engine/src/main/java/streamflow/engine/topology/TopologySubmitter.java
@@ -199,18 +199,19 @@ private Config buildStormConfig(StreamflowConfig streamflowConfig,
     }
 
     private Object loadProperty(String stringValue) {
-        Object boundValue;
+        // Default to using the string value
+        Object boundValue = stringValue;
 
         try {
             boundValue = Long.parseLong(stringValue);
         } catch (NumberFormatException ex1) {
             try {
                 boundValue = Double.parseDouble(stringValue);
             } catch (NumberFormatException ex2) {
-                try {
-                    boundValue = Boolean.parseBoolean(stringValue);
-                } catch (NumberFormatException ex3) {
-                    boundValue = stringValue;
+                if (stringValue.equalsIgnoreCase("true")) {
+                    boundValue = Boolean.TRUE;
+                } else if (stringValue.equalsIgnoreCase("false")) {
+                    boundValue = Boolean.FALSE;
                 }
             }
         }

diff --git a/streamflow-core/streamflow-model/pom.xml b/streamflow-core/streamflow-model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-model</artifactId>

diff --git a/streamflow-core/streamflow-server/pom.xml b/streamflow-core/streamflow-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-server</artifactId>

diff --git a/streamflow-core/streamflow-service/pom.xml b/streamflow-core/streamflow-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-service</artifactId>

diff --git a/streamflow-core/streamflow-util/pom.xml b/streamflow-core/streamflow-util/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-core</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-util</artifactId>

diff --git a/streamflow-dist/pom.xml b/streamflow-dist/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-dist</artifactId>

diff --git a/streamflow-frameworks/core-framework/pom.xml b/streamflow-frameworks/core-framework/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-frameworks</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>core-framework</artifactId>

diff --git a/streamflow-frameworks/pom.xml b/streamflow-frameworks/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>streamflow-frameworks</artifactId>

diff --git a/streamflow-frameworks/twitter-framework/pom.xml b/streamflow-frameworks/twitter-framework/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>streamflow</groupId>
         <artifactId>streamflow-frameworks</artifactId>
-        <version>0.12.0</version>
+        <version>0.12.1</version>
     </parent>
 
     <artifactId>twitter-framework</artifactId>