Merge pull request #92 from urbancamo/develop

- fix dxcc entity bug
urbancamo · Jun 12, 2024 · 067fe4b · 067fe4b
2 parents d1436c6 + dcd4916
commit 067fe4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>uk.m0nom</groupId>
   <artifactId>adif-processor</artifactId>
-  <version>1.3.9</version>
+  <version>1.3.10</version>
 
   <name>ADIF Processor</name>
   <url>https://github.com/urbancamo/adif-processor</url>

diff --git a/src/main/java/uk/m0nom/adifproc/dxcc/DxccEntities.java b/src/main/java/uk/m0nom/adifproc/dxcc/DxccEntities.java
@@ -161,7 +161,7 @@ private DxccEntity checkForLongestMatchingPrefix(String callsign, Map<String, Dx
 
     public void setFromDxccEntity(Qso qso, TransformControl control) {
         Adif3Record rec = qso.getRecord();
-        if (rec.getDxcc() != null) {
+        if (rec.getMyDxcc() != null) {
             qso.getFrom().setDxccEntity(control.getDxccEntities().getDxccEntity(rec.getMyDxcc()));
         } else {
             qso.getFrom().setDxccEntity(control.getDxccEntities().findDxccEntityFromCallsign(qso.getFrom().getCallsign(), qso.getRecord().getQsoDate()));
@@ -170,7 +170,7 @@ public void setFromDxccEntity(Qso qso, TransformControl control) {
 
     public void setToDxccEntity(Qso qso, TransformControl control) {
         Adif3Record rec = qso.getRecord();
-        if (rec.getMyDxcc() != null) {
+        if (rec.getDxcc() != null) {
             qso.getTo().setDxccEntity(control.getDxccEntities().getDxccEntity(rec.getDxcc()));
         } else {
             qso.getTo().setDxccEntity(control.getDxccEntities().findDxccEntityFromCallsign(qso.getTo().getCallsign(), qso.getRecord().getQsoDate()));