Skip to content

AMP-31112: issue- compare versions of activity leads to error #4483

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

Open
brianbrix wants to merge 2 commits into
base: develop
Choose a base branch
from
+3 −3
Open

AMP-31112: issue- compare versions of activity leads to error #4483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92df9b5
AMP-31112: issue- compare versions of activity leads to error
brianbrix May 21, 2026
ed106e3
AMP-31112: issue- compare versions of activity leads to error
brianbrix May 21, 2026
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 amp/docker/setenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions amp/src/main/java/org/digijava/module/aim/dbentity/AmpFundingAmount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading