Merge pull request #1168 from couchbase/feature/issue_listener_68

Hideki Itakura · Hideki Itakura · commit 1639eaf3806e · 2016-03-29T14:53:35.000-07:00
Fixed couchbase-lite-java-listener 68 - 1.2.1 Listener reporting inva…
diff --git a/src/main/java/com/couchbase/lite/support/Version.java b/src/main/java/com/couchbase/lite/support/Version.java
@@ -12,7 +12,7 @@ public class Version {
 
     static {
         int versCode = getVersionCode();
-        if (versCode == -1) {
+        if (versCode != 0) {
             VERSION = String.format("%s-%s", getVersionName(), getVersionCode());
         } else{
             VERSION = String.format("%s", getVersionName());
@@ -37,12 +37,11 @@ public static int getVersionCode() {
         }
 
         try {
-            Integer.parseInt(VERSION_CODE);
+            return Integer.parseInt(VERSION_CODE);
         } catch (NumberFormatException e) {
             Log.w(Log.TAG, "Cannot parse version code: %s", VERSION_CODE);
             return 0;
         }
-        return -1;
     }
 
     public static String getVersion() {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class Version {`
`12`	`12`
`13`	`13`	`static {`
`14`	`14`	`int versCode = getVersionCode();`
`15`		`- if (versCode == -1) {`
	`15`	`+ if (versCode != 0) {`
`16`	`16`	`VERSION = String.format("%s-%s", getVersionName(), getVersionCode());`
`17`	`17`	`} else{`
`18`	`18`	`VERSION = String.format("%s", getVersionName());`
`@@ -37,12 +37,11 @@ public static int getVersionCode() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`try {`
`40`		`- Integer.parseInt(VERSION_CODE);`
	`40`	`+ return Integer.parseInt(VERSION_CODE);`
`41`	`41`	`} catch (NumberFormatException e) {`
`42`	`42`	`Log.w(Log.TAG, "Cannot parse version code: %s", VERSION_CODE);`
`43`	`43`	`return 0;`
`44`	`44`	`}`
`45`		`- return -1;`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`public static String getVersion() {`