X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fupdate%2FUpload.java;h=a670f37d32bd930778b438f115f85e3f046049fa;hb=a6baa197a8a0333bc90e03a135441cacb7a133b9;hp=f308e22639af91b59dcb2a3f06ea06d50e7ada6d;hpb=4c93571c67abd90c6da8b4ed0d5b93e1fe25887d;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java
index f308e226..a670f37d 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java
@@ -73,10 +73,17 @@ public class Upload extends Batch {
 
 				if(file.exists()) {
 					count=batchCnt=0;
+					boolean justOne = false;
 					try {
 						BufferedReader br = new BufferedReader(new FileReader(file));
 						try {
 							while((line=br.readLine())!=null) {
+								if(line.length()>5000) {
+									if(query.length()>0) {
+										applyBatch(query);
+										justOne=true;
+									}
+								}
 								if(query.length()==0) {
 									query.append("BEGIN BATCH\n");
 								}
@@ -104,11 +111,12 @@ public class Upload extends Batch {
 								addField(feed,fldcnt,array,sb);
 								query.append(build(feed, array));
 								
-								if((++count % BATCH_LENGTH)==0) {
+								if((++count % BATCH_LENGTH)==0 || justOne) {
 									applyBatch(query);
+									justOne=false;
 								}
 							}
-							if((count % BATCH_LENGTH)!=0) {
+							if(query.length()>0) {
 								applyBatch(query);
 							}
 							
@@ -279,17 +287,20 @@ public class Upload extends Batch {
 	}
 
 	private void applyBatch(StringBuilder query) {
-		query.append("APPLY BATCH;");
-		ResultSet rv = session.execute(query.toString());
-		if(rv.wasApplied()) {
-			System.out.print('.');
-			if((++batchCnt % 60)==0) {
-				System.out.println();
+		try {
+			query.append("APPLY BATCH;");
+			ResultSet rv = session.execute(query.toString());
+			if(rv.wasApplied()) {
+				System.out.print('.');
+				if((++batchCnt % 60)==0) {
+					System.out.println();
+				}
+			} else {
+				System.out.print("Data NOT APPLIED");
 			}
-		} else {
-			System.out.print("Data NOT APPLIED");
+		} finally {
+			query.setLength(0);
 		}
-		query.setLength(0);
 	}