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.

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

back-port: Null pointer check added for system package (#1455) #1459

Merged

Conversation

gireeshpunathil
Copy link
Contributor

Null pointer check added for system package

Hashtable does not store null values , so if systempackage comes as null it will throw null pointer exception

/cc @MohananRahul

@gireeshpunathil
Copy link
Contributor Author

I get remote: error: GH006: Protected branch update failed for refs/heads/R4_31_maintenance. when I attempted to land this ( git push upstream R4_31_maintenance ). I don't want to use the GH UI button from an experience earlier where it did not record the committer name in the commit.
@HannesWell @akurtakov - any suggestions?

@merks
Copy link
Contributor

merks commented Dec 9, 2024

Looking here, I see there needs to be a version increment for the project being changed.

https://ci.eclipse.org/pde/job/eclipse.pde/job/PR-1459/1/console

I.e., if the containing project is version 1.0.200, it should be incremented to 1.0.201, i.e., +1 on the micro/service version. Perhaps including features will also need such increments...

@gireeshpunathil gireeshpunathil force-pushed the npe-back-port branch 2 times, most recently from 82996ec to 340a8a6 Compare December 9, 2024 13:46
@gireeshpunathil
Copy link
Contributor Author

@merks - thanks. looking at the CI log, the version upgradation is resolved now but new failure - not sure if it is related to infra. I am not sure if maintenance branch is well integrated into the build system

19:48:37  Exception in thread "Thread-3" java.lang.NoClassDefFoundError: org/eclipse/jgit/internal/JGitText
19:48:37  	at org.eclipse.jgit.internal.util.ShutdownHook.cleanup(ShutdownHook.java:85)
19:48:37  	at java.base/java.lang.Thread.run(Thread.java:840)
19:48:37  Caused by: java.lang.ClassNotFoundException: org.eclipse.jgit.internal.JGitText
19:48:37  	... 2 more
[Pipeline] }

@merks
Copy link
Contributor

merks commented Dec 9, 2024

That jgit error is a very old one that is a bug in jgit and has no real build impact other than being annoying.

This looks like a "real error" where probably a version increment is needed:

<pre><code>MavenProject: org.eclipse.pde:org.eclipse.e4.tools.persistence.feature:1.1.300-SNAPSHOT @ /home/jenkins/agent/workspace/eclipse.pde_PR-1459/features/org.eclipse.e4.tools.persistence.feature/.polyglot.feature.xml: baseline and build artifacts have same version but different contents</code></pre>

Maybe @laeubi or @HannesWell will be better at "reading the tea leaves" here...

@HannesWell
Copy link
Member

I get remote: error: GH006: Protected branch update failed for refs/heads/R4_31_maintenance. when I attempted to land this ( git push upstream R4_31_maintenance ). I don't want to use the GH UI button from an experience earlier where it did not record the committer name in the commit.

Using Rebase and merge is perfectly fine. Only Squash-and-merge caused trouble, but that's now disabled for PDE.

* Null pointer check added for system package

Hashtable does not store null values , so if systempackage comes as null it will throw null pointer exception
@gireeshpunathil gireeshpunathil merged commit d08772e into eclipse-pde:R4_31_maintenance Dec 10, 2024
2 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants