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

[base] transport exception using notify and await 1258 #1261

Merged
merged 3 commits into from
Nov 28, 2024
Merged

[base] transport exception using notify and await 1258 #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51f6a00
[base] transport exception using notify and await
LukasFey-GIP Nov 19, 2024
405c0d8
typo
LukasFey-GIP Nov 19, 2024
c1c047d
Merge branch 'main' into 1258-transport-exception-using-notify-and-await
LukasFey-GIP Nov 28, 2024
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
2 changes: 1 addition & 1 deletion modules/base/base/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<Application applicationName="Base" comment="" factoryVersion="" versionName="1.0.20" xmlVersion="1.1">
<Application applicationName="Base" comment="" factoryVersion="" versionName="1.0.21" xmlVersion="1.1">
<ApplicationInfo>
<Description Lang="DE">Diverse grundlegende DatenTypen und Services</Description>
<Description Lang="EN">Miscellaneous essential data types and services</Description>
Expand Down
18 changes: 17 additions & 1 deletion modules/base/base/mdmimpl/syncService/src/xprc/synchronization/SynchronizationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import com.gip.xyna.utils.exceptions.XynaException;
import com.gip.xyna.xdev.xfractmod.xmdm.GeneralXynaObject;
import com.gip.xyna.xdev.xfractmod.xmdm.XynaObject;
import com.gip.xyna.xfmg.xods.configuration.DocumentationLanguage;
import com.gip.xyna.xfmg.xods.configuration.XynaPropertyUtils.XynaPropertyBoolean;
import com.gip.xyna.xprc.XynaOrderServerExtension;
import com.gip.xyna.xprc.exceptions.XPRC_DUPLICATE_CORRELATIONID;
import com.gip.xyna.xprc.exceptions.XPRC_InvalidXMLForObjectCreationException;
Expand All @@ -34,6 +36,9 @@
public class SynchronizationImpl {

private static final String NULL_VALUE = "__NULL_VALUE_internal";
public static final XynaPropertyBoolean THROW_EXCEPTION = new XynaPropertyBoolean("xprc.synchronization.THROW_EXCEPTION", false)
.setDefaultDocumentation(DocumentationLanguage.DE, "Ist die Synchronization Answer eine Exception, wird diese vom Await Schritt geworfen.")
.setDefaultDocumentation(DocumentationLanguage.EN, "If the synchronization answer is an exception, that exception is thrown by the await.");


public SynchronizationImpl() {
Expand All @@ -59,13 +64,24 @@ public static XynaObject awaitNotification(XynaOrderServerExtension xo, Correlat
}


private static XynaObject createAnswer(String resultingAnswerString, Long rootRevision) {
private static XynaObject createAnswer(String resultingAnswerString, Long rootRevision) throws XynaException {
if (resultingAnswerString == null) {
return null;
}
if (resultingAnswerString.equals(NULL_VALUE)) {
return null;
}
if (resultingAnswerString.startsWith("<Exception ") && THROW_EXCEPTION.get()) {
try {
GeneralXynaObject obj = XynaObject.generalFromXml(resultingAnswerString, rootRevision);
if (obj instanceof XynaException) {
((XynaException) obj).setStackTrace(new StackTraceElement[0]);
throw (XynaException) obj;
}
} catch (XPRC_XmlParsingException | XPRC_InvalidXMLForObjectCreationException | XPRC_MDMObjectCreationException e) {
throw e;
}
}
if (resultingAnswerString.startsWith("<Data ")) {
try {
return XynaObject.fromXml(resultingAnswerString, rootRevision);
Expand Down
2 changes: 1 addition & 1 deletion modules/base/net/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/base/storables/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/connection/connection/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/dhcp/client/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/ldap/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/mail/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/queue/queue/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/script/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/snmp/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
4 changes: 2 additions & 2 deletions modules/xact/soap/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>>
</RuntimeContextRequirements>
</ApplicationInfo>
<SharedLibs>
<SharedLib implicitDependency="true">
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/velocity/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xfmg/csv/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xfmg/json/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xfmg/node/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xfmg/user/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xfmg/xynaproperty/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xint/crypto/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xint/regexp/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xnwh/timeseries/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
2 changes: 1 addition & 1 deletion modules/xprc/processing/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>Base</ApplicationName>
<VersionName>1.0.20</VersionName>
<VersionName>1.0.21</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down