Skip to content

Commit

Permalink
Upgrade lastnpe EEA to 2.4.0 (#4416)
Browse files Browse the repository at this point in the history
For release notes, see:

https://github.com/lastnpe/eclipse-null-eea-augments/releases/tag/v2.4.0

Signed-off-by: Wouter Born <github@maindrain.net>
  • Loading branch information
wborn authored Oct 20, 2024
1 parent 1325d80 commit a22349a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -995,8 +995,8 @@ private static SocketImpl newSocksSocketImpl() {
Method socketImplCreateMethod = socketImplClass.getDeclaredMethod("createPlatformSocketImpl",
boolean.class);
socketImplCreateMethod.setAccessible(true);
Object socketImpl = socketImplCreateMethod.invoke(/* null since we deal with static method */ null,
/* server */false);
Object socketImpl = socketImplCreateMethod
.invoke(/* null since we deal with static method */ giveNull(), /* server */false);

Constructor<?> socksSocketImplConstructor = socksSocketImplClass
.getDeclaredConstructor(socketImplClass);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,9 @@ private String getFileExtension(String fileName) {
*/
protected String getLocalizedProposedFilename(String filename, final WatchService watchService) {
final File file = new File(filename);
if (file.getParent() != null) {
watchSubDirectory(file.getParent(), watchService);
final String parent = file.getParent();
if (parent != null) {
watchSubDirectory(parent, watchService);
}

String sourcePath = getSourcePath();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

<bnd.version>7.0.0</bnd.version>
<commons.net.version>3.7.2</commons.net.version>
<eea.version>2.3.0</eea.version>
<eea.version>2.4.0</eea.version>
<karaf.compile.version>4.4.6</karaf.compile.version>
<karaf.tooling.version>4.4.6</karaf.tooling.version>
<sat.version>0.16.0</sat.version>
Expand Down

0 comments on commit a22349a

Please sign in to comment.