Changeset 32880

Timestamp:

2019-03-08T09:46:01+13:00 (5 years ago)

Author:

davidb

Message:

Test for version string made a little bit more general to allow for 'openjdk version' rather than 'java version'

File:

• main/trunk/search4j/libsearch4j.cpp (modified) (2 diffs)

main/trunk/search4j/libsearch4j.cpp

@@ -245 +245 @@
       bool found = false;
       while (caret < max_search_length && !found) {
-        if ( strcmp( output.substr( caret, 12 ).c_str() , "java version" ) == 0 ) {
-          era_ = atoi( output.substr(caret + 14,1).c_str() );
-          major_ = atoi( output.substr(caret + 16,1).c_str() );
-          minor_ = atoi( output.substr(caret + 18,1).c_str() );
-          update_ = atoi( output.substr(caret + 20,2).c_str() );
+        const int to_match_len = 8;
+        if ( strcmp( output.substr( caret, to_match_len ).c_str() , " version" ) == 0 ) {
+          era_ = atoi( output.substr(caret + to_match_len + 2,1).c_str() );
+          major_ = atoi( output.substr(caret + to_match_len + 4,1).c_str() );
+          minor_ = atoi( output.substr(caret + to_match_len + 6,1).c_str() );
+          update_ = atoi( output.substr(caret + to_match_len + 8,2).c_str() );
           found = true;
         }
@@ -318 +319 @@
     if ( verbose ) cout << "Searching for a JVM" << endl;
     
-    char *javaHomeEnv = "";
+    char *javaHomeEnv = NULL;
     bool jvmFound = false;