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

Upgrade lastnpe EEA to 2.4.0 #4416

Merged
merged 1 commit into from
Oct 20, 2024
Merged

Upgrade lastnpe EEA to 2.4.0 #4416

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
4 changes: 2 additions & 2 deletions ...o.transport.modbus/src/test/java/org/openhab/core/io/transport/modbus/test/SmokeTest.java
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions ...transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
View file
Open in desktop
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
View file
Open in desktop
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