Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reverted the IBM check to vendor check AND added an additional vm name check to remove false positives #2209

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Reverted the IBM check to vendor check AND added an additional vm name check to remove false positives #2209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/main/java/com/microsoft/sqlserver/jdbc/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,8 @@ private Util() {
private static final Lock LOCK = new ReentrantLock();

static boolean isIBM() {
Class<?> clazz = null;
try {
clazz = Class.forName("com.ibm.lang.management.MemoryUsage");
} catch (ClassNotFoundException e) {
//We're using the try-catch to test for IBM jdk, no need to handle exception.
}
return null != clazz;
String vmName = System.getProperty("java.vm.name");
return SYSTEM_JRE.startsWith("IBM") && vmName.startsWith("IBM");
}

static String getJVMArchOnWindows() {
Expand Down
Loading