Merge remote-tracking branch 'origin/releases/v6.x' into releases/v6.x

Author: lmajano

system/cache/providers/LuceeProvider.cfc

@@ -288,15 +288,18 @@ component
 		struct extra
 	){
 		// check if incoming timoeut is a timespan or minute to convert to timespan
-		if ( !findNoCase( "timespan", arguments.timeout.getClass().getName() )
-			AND !findNoCase( "duration", arguments.timeout.getClass().getName() ) ) {
+		if (
+			!findNoCase( "timespan", arguments.timeout.getClass().getName() )
+			AND !findNoCase( "duration", arguments.timeout.getClass().getName() )
+		) {
 			if ( !isNumeric( arguments.timeout ) ) {
 				arguments.timeout = 0;
 			}
 			arguments.timeout = createTimespan( 0, 0, arguments.timeout, 0 );
 		}
 
-		if ( !findNoCase( "timespan", arguments.lastAccessTimeout.getClass().getName() )
+		if (
+			!findNoCase( "timespan", arguments.lastAccessTimeout.getClass().getName() )
 			AND !findNoCase( "duration", arguments.lastAccessTimeout.getClass().getName() )
 		) {
 			if ( !isNumeric( arguments.lastAccessTimeout ) ) {

system/core/util/Util.cfc

@@ -495,7 +495,7 @@ component {
 		if ( server.keyExists( "boxlang" ) ) {
 			return ORMGetHibernateVersion();
 		}
-		
+
 		var version = createObject( "java", "org.hibernate.Version" );
 
 		if ( version.getVersionString() != "[WORKING]" ) {

tests/specs/core/util/UtilTest.cfc

@@ -135,4 +135,4 @@
 		fail( "Item '#itemName#' doesn't exists." );
 	}
 
-}
+}