Changeset 30172 for main/trunk/search4j/libsearch4j.cpp

Timestamp:

2015-09-02T16:02:44+12:00 (9 years ago)

Author:

ak19

Message:

John Thompson fixed a search4j bug that manifested on his Ubuntu and made the java version 0.0.0_00 because search4j expected a certain line of output (starting 'java version') to appear at the very start of the response returned from running java -version. However there may be other lines in the output that precede this, which John's patch allows for.

File:

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

main/trunk/search4j/libsearch4j.cpp

@@ -240 +240 @@
     
     if ( result == 0 ) {
-        if ( strcmp( output.substr( 0, 12 ).c_str() , "java version" ) == 0 || true ) {
-            era_ = atoi( output.substr(14,1).c_str() );
-            major_ = atoi( output.substr(16,1).c_str() );
-            minor_ = atoi( output.substr(18,1).c_str() );
-            update_ = atoi( output.substr(20,2).c_str() );
-        } else {
-            healthy_=false;
-        }
-    } else {
-        healthy_ = false;
+      // 22 is the length of sentinel string plus typical version value
+      int max_search_length = output.length() - 22;
+      int caret = 0;
+      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() );
+          found = true;
+        }
+        else {
+          caret++;
+        }
+      }
+      if (!found) {
+        healthy_ = false;
+      }
+    }
+    else {
+      healthy_ = false;
     }
 }