Merge "Improve Batches"

[aaf/authz.git] / auth / auth-core / src / main / java / org / onap / aaf / auth / org / FileMailer.java

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/FileMailer.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/FileMailer.java
index e5fc438..2e3801e 100644 (file)
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/FileMailer.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/FileMailer.java
@@ -58,7 +58,8 @@ public class FileMailer implements Mailer {
                }
                
                boolean dryrun = Boolean.parseBoolean(access.getProperty("DRY_RUN","false"));
-               int maxEmail = Integer.parseInt(access.getProperty("MAX_EMAIL", "-1"));
+               String str = access.getProperty("MAX_EMAIL", null);
+               int maxEmail = str==null || str.isEmpty()?Integer.MAX_VALUE:Integer.parseInt(str);
                if(dryrun && maxEmail==1) {
                        testName = "email_test";
                } else {
@@ -67,7 +68,7 @@ public class FileMailer implements Mailer {
        }
 
        @Override
-       public boolean sendEmail(AuthzTrans trans, boolean testMode, List<String> toList, List<String> ccList,
+       public boolean sendEmail(AuthzTrans trans, String test, List<String> toList, List<String> ccList,
                        String subject, String body, Boolean urgent) throws OrganizationException {
                boolean status = false;
                try {
@@ -75,7 +76,7 @@ public class FileMailer implements Mailer {
                        if(testName==null) {
                                path = Files.createTempFile(dir, "email", ".hdr");
                        } else {
-                               path = Paths.get(dir.toString(), "emailTEST.hdr");
+                               path = Paths.get(dir.toString(), "emailTEST"+test+".hdr");
                        }
                        BufferedWriter bw = Files.newBufferedWriter(path);
                        try {