Changeset 33930 for main/trunk

Timestamp:

2020-02-15T19:00:05+13:00 (4 years ago)

Author:

davidb

Message:

Code used to assume that major number was a single digit, as in 1.6 or 1.8. Now we have JDK 1.10 and above, and that the way version numbers are displayed has dropped the first part (the era), then search4j code needed to be updated to allow for this

File:

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

main/trunk/search4j/libsearch4j.cpp

@@ -176 +176 @@
 bool Jvm::setVersionFromString( string version ) {
     era_ = atoi( version.substr(0,1).c_str() );
-    major_ = atoi( version.substr(2,1).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;
-    }
+    if (version[3] == '.') {
+      // Parsing something like 1.8.0_24
+      major_ = atoi( version.substr(2,1).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;
+      }
+    }
+    else {
+      // Parsing something like 1.8.0_242
+      major_ = atoi( version.substr(2,2).c_str() );
+      if(version.length() >= 6) {
+        minor_ = atoi( version.substr(5,1).c_str() );
+      } else {
+        minor_ = 0;
+      }
+      if(version.length() >= 8) {
+        update_ = atoi( version.substr(7,2).c_str() );
+      } else {
+        update_ = 0;
+      }
+      
+    }
+    
     return true;
 }
 
 int Jvm::compare( Jvm otherJvm ) {
-    //era
+    //era  
     if ( era_ > otherJvm.getEra() )
         return 1;
@@ -247 +266 @@
         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() );
+          if (output[caret+to_match_len+3] == '.') {
+        // Version of the form 1.8.0_24
+        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() );
+          }
+          else {
+        // Version of the form 11.0.6
+        era_ = 1;
+        major_ = atoi( output.substr(caret + to_match_len + 2,2).c_str() );
+        minor_ = atoi( output.substr(caret + to_match_len + 5,1).c_str() );
+        update_ = atoi( output.substr(caret + to_match_len + 7,2).c_str() );
+
+          }
           found = true;
         }