LPS-48534 Can we not use the default java system property?

xieh · Jul 15, 2014 · 8bbf2d3 · 8bbf2d3
1 parent cbe2a3d
commit 8bbf2d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/benchmarks/benchmarks.properties b/benchmarks/benchmarks.properties
@@ -16,6 +16,11 @@
     sample.sql.asset.publisher.query.name=assetCategories
 	#sample.sql.asset.publisher.query.name=assetTags
 
+	#
+    # Specify the time zone.
+    #
+    sample.sql.db.time.zone=
+
     #
     # Specify the database type of the generated SQL files.
     #
@@ -34,11 +39,6 @@
     #sample.sql.db.type=sqlserver
     #sample.sql.db.type=sybase
 
-    #
-    # Specify the timezone is used to generate sql
-    #
-    sample.sql.db.timezone=
-
     #
     # Specify the number of asset categories to generate per asset vocabulary.
     #

diff --git a/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/DataFactory.java b/portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/DataFactory.java
@@ -723,17 +723,17 @@ public void initCompanyModel() {
 	}
 
 	public void initContext(Properties properties) {
-		String timeZone = properties.getProperty("sample.sql.db.timezone");
+		String timeZoneId = properties.getProperty("sample.sql.db.time.zone");
 
-		if (Validator.isNotNull(timeZone)) {
-			TimeZone newTimeZone = TimeZone.getTimeZone(timeZone);
+		if (Validator.isNotNull(timeZoneId)) {
+			TimeZone timeZone = TimeZone.getTimeZone(timeZoneId);
 
-			if (newTimeZone != null) {
-				TimeZone.setDefault(newTimeZone);
+			if (timeZone != null) {
+				TimeZone.setDefault(timeZone);
 
 				_simpleDateFormat =
 					FastDateFormatFactoryUtil.getSimpleDateFormat(
-						"yyyy-MM-dd HH:mm:ss", newTimeZone);
+						"yyyy-MM-dd HH:mm:ss", timeZone);
 			}
 		}