The profile selectors falls back to IAS4ProfileManager.getDefaultProfile

phax · Sep 14, 2023 · 61510f9 · 61510f9
1 parent 2b121b0
commit 61510f9
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/phase4-lib/src/main/java/com/helger/phase4/servlet/mgr/AS4ProfileSelector.java b/phase4-lib/src/main/java/com/helger/phase4/servlet/mgr/AS4ProfileSelector.java
@@ -22,6 +22,8 @@
 
 import com.helger.commons.concurrent.SimpleReadWriteLock;
 import com.helger.phase4.config.AS4Configuration;
+import com.helger.phase4.mgr.MetaAS4Manager;
+import com.helger.phase4.profile.IAS4Profile;
 
 /**
  * Static helper class to make the AS4 profile selection more deterministic and
@@ -69,6 +71,13 @@ public static String getAS4ProfileID ()
       // Fall back to the configuration file
       // The profile ID from the configuration file is optional
       ret = AS4Configuration.getAS4ProfileID ();
+      if (ret == null)
+      {
+        // Fall back to the default profile ID
+        final IAS4Profile aDefProfile = MetaAS4Manager.getProfileMgr ().getDefaultProfileOrNull ();
+        if (aDefProfile != null)
+          ret = aDefProfile.getID ();
+      }
     }
     return ret;
   }