Skip to content

[pull] master from apache:master #640

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

Merged
pull merged 1 commit into from
Jul 30, 2026
Merged

[pull] master from apache:master #640

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions zeppelin-server/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ public String getServerContextPath() {

public String getKeyStorePath() {
String path = getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH);
if (path != null && path.startsWith("/") || isWindowsPath(path)) {
if (path != null && (path.startsWith("/") || isWindowsPath(path))) {
return path;
} else {
return getAbsoluteDir(
Expand Down Expand Up @@ -385,7 +385,7 @@ public String getTrustStorePath() {
if (path == null) {
path = getKeyStorePath();
}
if (path != null && path.startsWith("/") || isWindowsPath(path)) {
if (path != null && (path.startsWith("/") || isWindowsPath(path))) {
return path;
} else {
return getAbsoluteDir(
Expand Down Expand Up @@ -667,7 +667,7 @@ public String getInterpreterPortRange() {
}

public boolean isWindowsPath(String path){
return path.matches("^[A-Za-z]:\\\\.*");
return path != null && path.matches("^[A-Za-z]:\\\\.*");
}

public boolean isPathWithScheme(String path){
Expand Down
8 changes: 8 additions & 0 deletions zeppelin-server/src/test/java/org/apache/zeppelin/conf/ZeppelinConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ void isWindowsPathTestFalse() {
assertFalse(isIt);
}

@Test
void isWindowsPathTestNull() {

ZeppelinConfiguration zConf = ZeppelinConfiguration.load("zeppelin-test-site.xml");
Boolean isIt = zConf.isWindowsPath(null);
assertFalse(isIt);
}

@Test
void isPathWithSchemeTestTrue() {

Expand Down
Loading