From 92df9b5d36abc2a8fde7587f9420c81efb3c13df Mon Sep 17 00:00:00 2001 From: brianbrix Date: Thu, 21 May 2026 19:38:37 +0300 Subject: [PATCH 1/2] AMP-31112: issue- compare versions of activity leads to error --- .../org/digijava/module/aim/dbentity/AmpFundingAmount.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amp/src/main/java/org/digijava/module/aim/dbentity/AmpFundingAmount.java b/amp/src/main/java/org/digijava/module/aim/dbentity/AmpFundingAmount.java index 7d4794903ba..2115652591d 100644 --- a/amp/src/main/java/org/digijava/module/aim/dbentity/AmpFundingAmount.java +++ b/amp/src/main/java/org/digijava/module/aim/dbentity/AmpFundingAmount.java @@ -150,12 +150,12 @@ public void setFunType(FundingType funType) { public boolean equalsForVersioning(Object obj) { AmpFundingAmount aux = (AmpFundingAmount) obj; String original = getVersionableStr(); - String copy = aux.funAmount + "-" + aux.currency.getCurrencyCode() + "-" + aux.funDate; + String copy = aux.funAmount + "-" + aux.getCurrencyCode() + "-" + aux.funDate; return original.equals(copy); } protected String getVersionableStr() { - return "" + this.funAmount + "-" + this.currency.getCurrencyCode() + "-" + this.funDate; + return "" + this.funAmount + "-" + getCurrencyCode() + "-" + this.funDate; } @Override From ed106e3d39fec95a105d1fbd67db4968917db3c0 Mon Sep 17 00:00:00 2001 From: brianbrix Date: Thu, 21 May 2026 21:09:17 +0300 Subject: [PATCH 2/2] AMP-31112: issue- compare versions of activity leads to error --- amp/docker/setenv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp/docker/setenv.sh b/amp/docker/setenv.sh index c5bbe2bbcf4..88b8abffe66 100755 --- a/amp/docker/setenv.sh +++ b/amp/docker/setenv.sh @@ -2,7 +2,7 @@ export UMASK=0022 -JAVA_OPTS="-server -Xmx16g -Djava.awt.headless=true" +JAVA_OPTS="-server -Xmx8g -Djava.awt.headless=true" JAVA_OPTS="$JAVA_OPTS -Demail.mode=smtp -DsmtpHost=ampdevde.aws.devgateway.org -DsmtpFrom=noreply@developmentgateway.org" JAVA_OPTS="$JAVA_OPTS -XX:HeapDumpPath=/opt/heapdumps -XX:+HeapDumpOnOutOfMemoryError"