From a847b81792e94137455710e1d21e09cea60bee5c Mon Sep 17 00:00:00 2001
From: Madhukar <madhukar@confluxtechnologies.com>
Date: Wed, 11 Apr 2018 10:41:53 +0530
Subject: [PATCH] FINERACT-613:500 Internal Server Errors on Data Tables

---
 .../dataqueries/service/ReadWriteNonCoreDataServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
index 31fdfca54..29ec818fb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
@@ -1187,8 +1187,8 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
             sql = sql + "select * from `" + dataTableName + "` where id = " + id;
         }
 
-        this.columnValidator.validateSqlInjection(sql, order);
-        if (order != null) {
+        if (StringUtils.isNotBlank(order)) {
+            this.columnValidator.validateSqlInjection(sql, order);
             sql = sql + " order by " + order;
         }