[ofbiz-framework] branch trunk updated: Fixed: 'FindJob' generates an error

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new e0c8a1f  Fixed: 'FindJob' generates an error
e0c8a1f is described below

commit e0c8a1f4b0374a490d6dcebb79650106c45719c8
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Tue Apr 14 13:42:11 2020 +0200

    Fixed: 'FindJob' generates an error
    
    (OFBIZ-11590)
    
    This is due to OFBIZ-11402. Handling a converter for java.time.ZoneRegion is
    complicated. Adding a toString() is enough.
    
    Also 2 automated formatting while at it...
---
 framework/common/groovyScripts/CommonServices.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/common/groovyScripts/CommonServices.groovy b/framework/common/groovyScripts/CommonServices.groovy
index 48fe0ec..af9832e 100644
--- a/framework/common/groovyScripts/CommonServices.groovy
+++ b/framework/common/groovyScripts/CommonServices.groovy
@@ -127,7 +127,7 @@ def convertUom() {
 
     // all done
     result.convertedValue = convertedValue
-    logVerbose("""Uom conversion of [${parameters.originalValue}] from [${parameters.uomId}] 
+    logVerbose("""Uom conversion of [${parameters.originalValue}] from [${parameters.uomId}]
                            to [${parameters.uomIdTo}] using conversion factor [${uomConversion.conversionFactor}],
                            result is [${convertedValue}]""")
 
@@ -318,7 +318,7 @@ def getServerTimestamp() {
 
 def getServerTimeZone() {
     Map result = success()
-    result.serverTimeZone = TimeZone.getDefault().toZoneId()
+    result.serverTimeZone = TimeZone.getDefault().toZoneId().toString()
     return result
 }
 
@@ -352,4 +352,4 @@ def deleteKeywordThesaurus() {
     }
     delegator.removeByAnd("KeywordThesaurus", newEntity)
     return success()
-}
\ No newline at end of file
+}