svn commit: r1694810 - in /ofbiz/trunk/applications/product/src/org/ofbiz/product/category: SeoContextFilter.java UrlRegexpContextFilter.java

[shijh]

Author: shijh
Date: Sat Aug  8 15:19:40 2015
New Revision: 1694810

URL: http://svn.apache.org/r1694810
Log:
Change UtilProperties.getPropertyValue("general.properties", "multitenant") to EntityUtil.isMultiTenantEnabled().

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java?rev=1694810&r1=1694809&r2=1694810&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java Sat Aug  8 15:19:40 2015
@@ -46,7 +46,6 @@ import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilObject;
-import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.DelegatorFactory;
@@ -291,8 +290,8 @@ public class SeoContextFilter extends Co
         }
 
         // check if multi tenant is enabled
-        String useMultitenant = UtilProperties.getPropertyValue("general.properties", "multitenant");
-        if ("Y".equals(useMultitenant)) {
+        boolean useMultitenant = EntityUtil.isMultiTenantEnabled();
+        if (useMultitenant) {
             // get tenant delegator by domain name
             String serverName = httpRequest.getServerName();
             try {

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java?rev=1694810&r1=1694809&r2=1694810&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/UrlRegexpContextFilter.java Sat Aug  8 15:19:40 2015
@@ -254,8 +254,8 @@ public class UrlRegexpContextFilter exte
         }
 
         // check if multi tenant is enabled
-        String useMultitenant = UtilProperties.getPropertyValue("general.properties", "multitenant");
-        if ("Y".equals(useMultitenant)) {
+        boolean useMultitenant = EntityUtil.isMultiTenantEnabled();
+        if (useMultitenant) {
             // get tenant delegator by domain name
             String serverName = httpRequest.getServerName();
             try {