Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,24 @@ gurux.dlms.client.example.java/ManufacturerSettings/files.xml
ManufacturerSettings/files.xml
gurux.dlms.client.example.java/logFile.txt
gurux.dlms.client.example.java/trace.txt

#############
## Maven
#############
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties

# Exclude maven wrapper
!/.mvn/wrapper/maven-wrapper.jar

#############
## Jetbrains: Intellij
#############
.idea
8 changes: 7 additions & 1 deletion development/src/main/java/gurux/dlms/GXDLMSConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,13 @@ private static void updateOBISCodeInfo(
return;
}
String ln = it.getLogicalName();
GXStandardObisCode code = codes.find(ln, it.getObjectType())[0];

GXStandardObisCode code = null;
GXStandardObisCode[] codesArray = codes.find(ln, it.getObjectType());
if (codesArray.length > 0) {
code = codes.find(ln, it.getObjectType())[0];
}

if (code != null) {
it.setDescription(code.getDescription());
// If string is used
Expand Down
42 changes: 0 additions & 42 deletions gurux.dlms.client.example.java/dependency-reduced-pom.xml

This file was deleted.

50 changes: 0 additions & 50 deletions gurux.dlms.server.example.java/dependency-reduced-pom.xml

This file was deleted.