svn commit: r567519 - /ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java

[jonesde]

Author: jonesde
Date: Sun Aug 19 19:00:58 2007
New Revision: 567519

URL: http://svn.apache.org/viewvc?rev=567519&view=rev
Log:
Small change to avoid warning messages

Modified:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?rev=567519&r1=567518&r2=567519&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java 
(original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Sun 
Aug 19 19:00:58 2007
@@ -756,14 +756,20 @@
         }
 
         if (locale == null) {
-            locale = (Locale) source.get("locale");
+            // if statement here to avoid warning messages for Entity ECA 
service input validation, even though less efficient that doing a straight get
+            if (source.containsKey("locale")) {
+                locale = (Locale) source.get("locale");
+            }
             if (locale == null) {
                 locale = Locale.getDefault();
             }
         }
         
         if (timeZone == null) {
-            timeZone = (TimeZone) source.get("timeZone");
+            // if statement here to avoid warning messages for Entity ECA 
service input validation, even though less efficient that doing a straight get
+            if (source.containsKey("timeZone")) {
+                timeZone = (TimeZone) source.get("timeZone");
+            }
             if (timeZone == null) {
                 timeZone = TimeZone.getDefault();
             }