Changeset 28699 for main/trunk

Timestamp:

2013-11-26T16:06:16+13:00 (10 years ago)

Author:

ak19

Message:

Jeremy (jts21) has fixed a bug in search4j. In the past the -m flag to set the minimum Java version needed to be of the form 1.8.0_0 and could not accept 1.8.0 and would crash. Now the java minor and update version numbers are optional.

File:

• main/trunk/search4j/libsearch4j.cpp (modified) (1 diff)

main/trunk/search4j/libsearch4j.cpp

@@ -177 +177 @@
     era_ = atoi( version.substr(0,1).c_str() );
     major_ = atoi( version.substr(2,1).c_str() );
-    minor_ = atoi( version.substr(4,1).c_str() );
-    update_ = atoi( version.substr(6,2).c_str() );
+    if(version.length() >= 5) {
+      minor_ = atoi( version.substr(4,1).c_str() );
+    } else {
+      minor_ = 0;
+    }
+    if(version.length() >= 7) {
+      update_ = atoi( version.substr(6,2).c_str() );
+    } else {
+      update_ = 0;
+    }
     return true;
 }