Don't join FaoInstitute if not needed, avoid NPE in #sort

src/main/java/org/genesys2/server/service/impl/DirectMysqlQuery.java

@@ -99,28 +99,28 @@ public class DirectMysqlQuery {
 	protected DirectMysqlQuery join(AppliedFilters filters) {
 		if (hasFilter(filters, FilterConstants.CROPS) || hasFilter(filters, FilterConstants.TAXONOMY_GENUS)
 				|| hasFilter(filters, FilterConstants.TAXONOMY_SPECIES) || hasFilter(filters, FilterConstants.TAXONOMY_SCINAME)) {
-			
+
 			innerJoin("taxonomy2", "t", "t.id=a.taxonomyId2");
-			
+
 			if (hasFilter(filters, FilterConstants.CROPS)) {
 				innerJoin("croptaxonomy", "ct", "ct.taxonomyId=t.id");
 				innerJoin("crop", null, "crop.id=ct.cropId");
 			}
 		}
-		
-//		if (hasFilter(filters, FilterConstants.ORGCTY_ISO3)) {
-//			innerJoin("country", "cty", "cty.id=a.orgCtyId");
-//		}
-		
-		if (hasFilter(filters, FilterConstants.INSTCODE) || hasFilter(filters, FilterConstants.INSTITUTE_COUNTRY_ISO3)
+
+		// if (hasFilter(filters, FilterConstants.ORGCTY_ISO3)) {
+		// innerJoin("country", "cty", "cty.id=a.orgCtyId");
+		// }
+
+		if (/* hasFilter(filters, FilterConstants.INSTCODE) || */hasFilter(filters, FilterConstants.INSTITUTE_COUNTRY_ISO3)
 				|| hasFilter(filters, FilterConstants.INSTITUTE_NETWORK)) {
-			
+
 			innerJoin("faoinstitute", "fao", "fao.id=a.instituteId");
-			
+
 			if (hasFilter(filters, FilterConstants.INSTITUTE_COUNTRY_ISO3)) {
 				innerJoin("country", "faocty", "faocty.id=fao.countryId");
 			}
-			
+
 			if (hasFilter(filters, FilterConstants.INSTITUTE_NETWORK)) {
 				innerJoin("organizationinstitute", "oi", "oi.instituteId=fao.id");
 				innerJoin("organization", "org", "org.id=oi.organizationId");
@@ -421,6 +421,10 @@ public class DirectMysqlQuery {
 	}
 
 	public DirectMysqlQuery sort(Sort sort) {
+		if (sort == null) {
+			return this;
+		}
+
 		if (sortBuffer.length() != 0) {
 			throw new RuntimeException("sortBuffer is not blank, invalid use of #pageable(Pageable)");
 		}