Skip to content

Fixing NPE in GitXmlRpcSshService: removing explicit adding of resource from RT JAR #33

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
VISTALL merged 2 commits into from
Mar 20, 2026
Merged

Fixing NPE in GitXmlRpcSshService: removing explicit adding of resource from RT JAR #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a8e349
Fixing NPE in GitXmlRpcSshService: removing explicit adding of resour…
unv-unv Mar 20, 2026
ee56018
Removing obsolete methods in ScriptGenerator.
unv-unv Mar 20, 2026
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
2 changes: 0 additions & 2 deletions plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import jakarta.inject.Singleton;
import org.jetbrains.git4idea.rt.ssh.GitSSHHandler;
import org.jetbrains.git4idea.rt.ssh.SSHMain;
import org.jetbrains.git4idea.rt.ssh.SSHMainBundle;
import org.jetbrains.git4idea.util.ScriptGenerator;

import java.util.UUID;
Expand All @@ -47,7 +46,6 @@ public class GitXmlRpcSshService extends GitXmlRpcHandlerService<GitSSHGUIHandle
@Override
protected void customizeScriptGenerator(@Nonnull ScriptGenerator generator) {
generator.addClasses(KnownHosts.class);
generator.addResource(SSHMainBundle.class, "/org/jetbrains/git4idea/ssh/SSHMainBundle.properties");
}

@Nonnull
Expand Down
26 changes: 0 additions & 26 deletions plugin/src/main/java/org/jetbrains/git4idea/util/ScriptGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import consulo.platform.Platform;
import consulo.util.collection.ContainerUtil;
import consulo.util.io.ClassPathUtil;
import consulo.util.io.FileUtil;
import consulo.util.io.NioFiles;
import consulo.util.io.URLUtil;
Expand Down Expand Up @@ -124,18 +123,6 @@ private void addPath(String path) {
}
}

/**
* Add source for the specified resource
*
* @param base the resource base
* @param resource the resource name
* @return this script generator
*/
public ScriptGenerator addResource(Class base, String resource) {
addPath(getJarForResource(base, resource));
return this;
}

/**
* Add internal parameters for the script
*
Expand Down Expand Up @@ -199,17 +186,4 @@ public String commandLine() {
}
return line;
}

/**
* Get path for resources.jar
*
* @param context a context class
* @param res a resource
* @return a path to classpath entry
*/
@SuppressWarnings({"SameParameterValue"})
public static String getJarForResource(Class context, String res) {
String resourceRoot = ClassPathUtil.getResourceRoot(context, res);
return new File(resourceRoot).getAbsoluteFile().getAbsolutePath();
}
}
Loading