svn commit: r1768192 [2/2] - in /ofbiz/trunk: applications/accounting/src/main/java/org/apache/ofbiz/accounting/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/ applications/accounting/src/main/java/org/apache/ofbiz/accountin...

[diveshdutta]

Modified: ofbiz/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java (original)
+++ ofbiz/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java Sat Nov  5 11:27:46 2016
@@ -121,7 +121,7 @@ public class LoginEvents {
 
         try {
             GenericValue userLoginSecurityQuestion = delegator.findOne("UserLoginSecurityQuestion", UtilMisc.toMap("questionEnumId", questionEnumId, "userLoginId", userLoginId), true);
-            if (UtilValidate.isNotEmpty(userLoginSecurityQuestion)) {
+            if (userLoginSecurityQuestion != null) {
                 if (UtilValidate.isEmpty(securityAnswer)) {
                     errMsg = UtilProperties.getMessage(resource, "loginservices.security_answer_empty", UtilHttp.getLocale(request));
                     request.setAttribute("_ERROR_MESSAGE_", errMsg);

Modified: ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java (original)
+++ ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java Sat Nov  5 11:27:46 2016
@@ -227,7 +227,7 @@ public final class EntityUtilProperties
                     .from("SystemProperty")
                     .where("systemResourceId", resourceName, "systemPropertyId", name)
                     .queryOne();
-            if (UtilValidate.isNotEmpty(gv)) {
+            if (gv != null) {
                 prevValue = gv.getString("systemPropertyValue");
                 gv.set("systemPropertyValue", value);
             } else {

Modified: ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java (original)
+++ ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java Sat Nov  5 11:27:46 2016
@@ -131,7 +131,7 @@ public class JavaMailContainer implement
         }
 
         // start the polling timer
-        if (UtilValidate.isNotEmpty(stores)) {
+        if (stores != null) {
             pollTimer.scheduleAtFixedRate(new PollerTask(dispatcher, userLogin), timerDelay, timerDelay, TimeUnit.MILLISECONDS);
         } else {
             Debug.logWarning("No JavaMail Store(s) configured; poller disabled.", module);
@@ -296,7 +296,7 @@ public class JavaMailContainer implement
 
         @Override
         public void run() {
-            if (UtilValidate.isNotEmpty(stores)) {
+            if (stores != null) {
                 for (Map.Entry<Store, Session> entry: stores.entrySet()) {
                     Store store = entry.getKey();
                     Session session = entry.getValue();

Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java Sat Nov  5 11:27:46 2016
@@ -152,7 +152,7 @@ public class PortalPageWorker {
 
         if (UtilValidate.isNotEmpty(portalPageId)) {
             GenericValue userLogin = (GenericValue) context.get("userLogin");
-            if (UtilValidate.isNotEmpty(userLogin)) {
+            if (userLogin != null) {
                 String userLoginId = (String) userLogin.get("userLoginId");
                 Security security = (Security) context.get("security");
 
@@ -160,7 +160,7 @@ public class PortalPageWorker {
                 try {
                     Delegator delegator = WidgetWorker.getDelegator(context);
                     GenericValue portalPage = EntityQuery.use(delegator).from("PortalPage").where("portalPageId", portalPageId).queryOne();
-                    if (UtilValidate.isNotEmpty(portalPage)) {
+                    if (portalPage != null) {
                         String ownerUserLoginId = (String) portalPage.get("ownerUserLoginId");
                         // Users with PORTALPAGE_ADMIN permission can configure every Portal Page
                         userIsAllowed = (ownerUserLoginId.equals(userLoginId) || hasPortalAdminPermission);

Modified: ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java (original)
+++ ofbiz/trunk/specialpurpose/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java Sat Nov  5 11:27:46 2016
@@ -80,7 +80,7 @@ public class WebSiteFilter implements Fi
 
         GenericValue webSite = null;
         try {
-            if (UtilValidate.isNotEmpty(webSiteAlias) && UtilValidate.isEmpty(webSite)) {
+            if (UtilValidate.isNotEmpty(webSiteAlias) && webSite != null) {
                 webSite = EntityQuery.use(delegator).from("WebSite").where("hostedPathAlias", webSiteAlias).cache().queryFirst();
             }
             if (UtilValidate.isEmpty(webSite)) {

Modified: ofbiz/trunk/specialpurpose/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java Sat Nov  5 11:27:46 2016
@@ -74,7 +74,7 @@ public class EbayHelper {
                 String errMsg = UtilProperties.getMessage(resource, "buildEbayConfig.unableToFindEbayConfig" + e.getMessage(), locale);
                 return ServiceUtil.returnError(errMsg);
             }
-            if (UtilValidate.isNotEmpty(eBayConfig)) {
+            if (eBayConfig != null) {
                 buildEbayConfigContext.put("devID", eBayConfig.getString("devId"));
                 buildEbayConfigContext.put("appID", eBayConfig.getString("appId"));
                 buildEbayConfigContext.put("certID", eBayConfig.getString("certId"));
@@ -172,7 +172,7 @@ public class EbayHelper {
         String shipmentMethodTypeId = "NO_SHIPPING";
         try {
             GenericValue ebayShippingMethod = EntityQuery.use(delegator).from("EbayShippingMethod").where("shipmentMethodName", shippingService, "productStoreId", productStoreId).queryOne();
-            if (UtilValidate.isNotEmpty(ebayShippingMethod)) {
+            if (ebayShippingMethod != null) {
                 partyId = ebayShippingMethod.getString("carrierPartyId");
                 shipmentMethodTypeId = ebayShippingMethod.getString("shipmentMethodTypeId");
             } else {
@@ -297,7 +297,7 @@ public class EbayHelper {
         String partyId = null;
 
         try {
-            if (UtilValidate.isNotEmpty(name) && UtilValidate.isNotEmpty(userLogin)) {
+            if (UtilValidate.isNotEmpty(name) && userLogin != null) {
                 Debug.logVerbose("Creating Customer Party: " + name, module);
 
                 // Try to split the lastname from the firstname
@@ -624,7 +624,7 @@ public class EbayHelper {
                 }
                 if (UtilValidate.isNotEmpty(titleFirstWord)) {
                     GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", titleFirstWord).queryOne();
-                    if (UtilValidate.isNotEmpty(product)) {
+                    if (product != null) {
                         productId = product.getString("productId");
                     }
                 }

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java Sat Nov  5 11:27:46 2016
@@ -863,7 +863,7 @@ public class EbayEvents {
 
                         if (UtilValidate.isNotEmpty(requestParams.get("requireEbayInventory")) && "Y".equals(requestParams.get("requireEbayInventory").toString())) {
                             GenericValue ebayProductStore = EntityQuery.use(delegator).from("EbayProductStoreInventory").where("productStoreId", productStoreId, "productId", productId).filterByDate().queryFirst();
-                            if (UtilValidate.isNotEmpty(ebayProductStore)) {
+                            if (ebayProductStore != null) {
                                 String facilityId = ebayProductStore.getString("facilityId");
                                 BigDecimal atp = ebayProductStore.getBigDecimal("availableToPromiseListing");
                                 int intAtp = atp.intValue();
@@ -899,11 +899,11 @@ public class EbayEvents {
                         }
                         try {
                             GenericValue storeRole = EntityQuery.use(delegator).from("ProductStoreRole").where("productStoreId", productStoreId, "roleTypeId", "EBAY_ACCOUNT").queryFirst();
-                            if (UtilValidate.isNotEmpty(storeRole)) {
+                            if (storeRole != null) {
                                 GenericValue eBayUserLogin = EntityQuery.use(delegator).from("UserLogin")
                                                                            .where("partyId", storeRole.get("partyId"))
                                                                            .queryFirst();
-                                if (UtilValidate.isNotEmpty(eBayUserLogin)) {
+                                if (eBayUserLogin != null) {
                                     prodMap.put("userLoginId", eBayUserLogin.get("userLoginId").toString());
                                 }
                             }

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java Sat Nov  5 11:27:46 2016
@@ -1550,7 +1550,7 @@ public class EbayStore {
             String facilityId = "";
             if (UtilValidate.isNotEmpty(context.get("requireEbayInventory")) && "on".equals(context.get("requireEbayInventory").toString())) {
                 GenericValue ebayProductStore = EntityQuery.use(delegator).from("EbayProductStoreInventory").where("productStoreId", context.get("productStoreId").toString(), "productId", context.get("productId")).filterByDate().queryFirst();
-                if (UtilValidate.isNotEmpty(ebayProductStore)) {
+                if (ebayProductStore != null) {
                     facilityId = ebayProductStore.getString("facilityId");
                     BigDecimal atp = ebayProductStore.getBigDecimal("availableToPromiseListing");
                     intAtp = atp.intValue();
@@ -1563,9 +1563,9 @@ public class EbayStore {
             GenericValue userLogin = (GenericValue) context.get("userLogin");
             if (UtilValidate.isNotEmpty(context.get("productCategoryId"))) {
                 GenericValue prodCategoryMember = EntityQuery.use(delegator).from("ProductCategoryMember").where("productCategoryId", context.get("productCategoryId"),"productId", context.get("productId")).filterByDate().queryFirst();
-                if (UtilValidate.isNotEmpty(prodCategoryMember)) {
+                if (prodCategoryMember != null) {
                     GenericValue prodCategoryRole = EntityQuery.use(delegator).from("ProductCategoryRole").where("productCategoryId", prodCategoryMember.get("productCategoryId").toString(), "partyId", userLogin.get("partyId"),"roleTypeId", "EBAY_ACCOUNT").filterByDate().queryFirst();
-                    if (UtilValidate.isNotEmpty(prodCategoryRole)) {
+                    if (prodCategoryRole != null) {
                         context.put("ebayCategory", prodCategoryRole.get("comments"));
                     } else {
                         result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_FAIL);
@@ -1578,9 +1578,9 @@ public class EbayStore {
                 while (prodCategoryMemberIter.hasNext()) {
                     GenericValue prodCategory = prodCategoryMemberIter.next();
                     GenericValue prodCatalogCategory = EntityQuery.use(delegator).from("ProdCatalogCategory").where("prodCatalogId", context.get("prodCatalogId"), "productCategoryId", prodCategory.get("productCategoryId").toString()).filterByDate().queryFirst();
-                    if (UtilValidate.isNotEmpty(prodCatalogCategory)) {
+                    if (prodCatalogCategory != null) {
                         GenericValue prodCategoryRole = EntityQuery.use(delegator).from("ProductCategoryRole").where("productCategoryId", prodCatalogCategory.get("productCategoryId").toString(), "partyId", userLogin.get("partyId"),"roleTypeId", "EBAY_ACCOUNT").filterByDate().queryFirst();
-                        if (UtilValidate.isNotEmpty(prodCategoryRole)) {
+                        if (prodCategoryRole != null) {
                             context.put("ebayCategory", prodCategoryRole.get("comments"));
                         } else {
                             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_FAIL);
@@ -2471,7 +2471,7 @@ public class EbayStore {
         boolean checkResult = false;
         try {
             GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne();
-            if(UtilValidate.isNotEmpty(product)) {
+            if(product != null) {
                 checkResult = true;
             }
         } catch(GenericEntityException e) {

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java Sat Nov  5 11:27:46 2016
@@ -143,7 +143,7 @@ public class EbayStoreAutoPreferences {
         try {
             ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
             ebayProductStorePref = EntityQuery.use(delegator).from("EbayProductStorePref").where("productStoreId", productStoreId, "autoPrefEnumId", "EBAY_AUTO_PIT_FB").queryOne();
-            if (UtilValidate.isNotEmpty(ebayProductStorePref) && UtilValidate.isNotEmpty(ebayProductStorePref.getString("autoPrefJobId"))) {
+            if (ebayProductStorePref != null && UtilValidate.isNotEmpty(ebayProductStorePref.getString("autoPrefJobId"))) {
                 isAutoPositiveFeedback = ebayProductStorePref.getString("enabled");
                 // if isAutoPositiveFeedback is N that means not start this job run service
                 if ("Y".equals(isAutoPositiveFeedback) && jobId.equals(ebayProductStorePref.getString("autoPrefJobId"))) {
@@ -272,7 +272,7 @@ public class EbayStoreAutoPreferences {
             ebayProductStorePref = EntityQuery.use(delegator).from("EbayProductStorePref").where("productStoreId", productStoreId, "autoPrefEnumId", "EBAY_AUTO_PIT_FB").queryOne();
             context.put("productStoreId", productStoreId);
             context.put("autoPrefEnumId", "EBAY_AUTO_PIT_FB");
-            if (UtilValidate.isNotEmpty(ebayProductStorePref) && UtilValidate.isNotEmpty(ebayProductStorePref.getString("autoPrefJobId"))) {
+            if (ebayProductStorePref != null && UtilValidate.isNotEmpty(ebayProductStorePref.getString("autoPrefJobId"))) {
                 autoPrefJobId = ebayProductStorePref.getString("autoPrefJobId");
             }
             context.put("autoPrefJobId", autoPrefJobId);
@@ -748,7 +748,7 @@ public class EbayStoreAutoPreferences {
             if (sellingManagerSoldOrders != null) {
                 int soldOrderLength = sellingManagerSoldOrders.length;
                 GenericValue ebayPref = EntityQuery.use(delegator).from("EbayProductStorePref").where("productStoreId", productStoreId, "autoPrefEnumId", "ENA_COMB_ORD").queryOne();
-                if (UtilValidate.isNotEmpty(ebayPref)) {
+                if (ebayPref != null) {
 
                     Timestamp beginDate = UtilDateTime.toTimestamp("01/01/2001 00:00:00");
                     Long daysCount = Long.parseLong(ebayPref.get("condition1").toString());

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java Sat Nov  5 11:27:46 2016
@@ -624,7 +624,7 @@ public class EbayStoreHelper {
     GetOrdersResponseType resp = null;
     try {
         GenericValue orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
-        if (UtilValidate.isNotEmpty(orderHeader)) {
+        if (orderHeader != null) {
             String externalId = orderHeader.getString("externalId").toString();
             List<GenericValue> orderShipment = orderHeader.getRelated("OrderShipment", null, null, false);
             if (orderShipment.size() > 0) {
@@ -725,7 +725,7 @@ public class EbayStoreHelper {
         boolean isReserve = false;
         try {
             GenericValue ebayProductStore = EntityQuery.use(delegator).from("EbayProductStoreInventory").where("productStoreId", productStoreId, "productId", productId).filterByDate().queryFirst();
-            if (UtilValidate.isNotEmpty(ebayProductStore)) {
+            if (ebayProductStore != null) {
                 BigDecimal atp = ebayProductStore.getBigDecimal("availableToPromiseListing");
                 int intAtp = atp.intValue();
                 if (intAtp > 0) {

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java Sat Nov  5 11:27:46 2016
@@ -105,7 +105,7 @@ public class EbayStoreOrder {
                 return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale));
             } else {
                 GenericValue productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).queryOne();
-                if (UtilValidate.isNotEmpty(productStore)) {
+                if (productStore != null) {
                     defaultCurrencyUomId = productStore.getString("defaultCurrencyUomId");
                     payToPartyId = productStore.getString("payToPartyId");
                     facilityId = productStore.getString("inventoryFacilityId");
@@ -173,7 +173,7 @@ public class EbayStoreOrder {
                 BigDecimal shippingAmount = new BigDecimal(shippingCost);
                 if (shippingAmount.doubleValue() > 0) {
                     GenericValue shippingAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SHIPPING_CHARGES", cart.getOrderId(), null, null, shippingAmount.doubleValue(), 0.0);
-                    if (UtilValidate.isNotEmpty(shippingAdjustment)) {
+                    if (shippingAdjustment != null) {
                         cart.addAdjustment(shippingAdjustment);
                     }
                 }
@@ -200,7 +200,7 @@ public class EbayStoreOrder {
                         salesPercent = new Double(salesTaxPercent).doubleValue();
                     }
                     GenericValue salesTaxAdjustment = EbayHelper.makeOrderAdjustment(delegator, "SALES_TAX", cart.getOrderId(), null, null, salesTaxAmountTotal, salesPercent);
-                    if (UtilValidate.isNotEmpty(salesTaxAdjustment)) {
+                    if (salesTaxAdjustment != null) {
                         cart.addAdjustment(salesTaxAdjustment);
                     }
                 }
@@ -216,7 +216,7 @@ public class EbayStoreOrder {
                 }
 
                 // if we get a party, check its contact information.
-                if (UtilValidate.isNotEmpty(partyAttribute)) {
+                if (partyAttribute != null) {
                     partyId = (String) partyAttribute.get("partyId");
                     Debug.logInfo("Found existing party associated to the eBay buyer: " + partyId, module);
                     GenericValue party = EntityQuery.use(delegator).from("Party").where("partyId", partyId).queryOne();
@@ -444,7 +444,7 @@ public class EbayStoreOrder {
             GenericValue partyAttribute = null;
             if (UtilValidate.isNotEmpty(context.get("eiasTokenBuyer"))) {
                 partyAttribute = EntityQuery.use(delegator).from("PartyAttribute").where("attrValue", (String) context.get("eiasTokenBuyer")).queryFirst();
-                if (UtilValidate.isNotEmpty(partyAttribute)) {
+                if (partyAttribute != null) {
                     partyId = (String) partyAttribute.get("partyId");
                 }
             }

Modified: ofbiz/trunk/specialpurpose/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java Sat Nov  5 11:27:46 2016
@@ -231,7 +231,7 @@ public class JanrainHelper {
             
             try {
                 GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", preferredUsername).cache().queryOne();
-                if (UtilValidate.isNotEmpty(userLogin)) {
+                if (userLogin != null) {
                     LoginWorker.doBasicLogin(userLogin, request);
                     LoginWorker.autoLoginSet(request, response);
                     return "success";

Modified: ofbiz/trunk/specialpurpose/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java (original)
+++ ofbiz/trunk/specialpurpose/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java Sat Nov  5 11:27:46 2016
@@ -252,7 +252,7 @@ public class LinkedInEvents {
             request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
             return "error";
         }
-        if (UtilValidate.isNotEmpty(linkedInUser)) {
+        if (linkedInUser != null) {
             boolean dataChanged = false;
             if (!accessToken.equals(linkedInUser.getString("accessToken"))) {
                 linkedInUser.set("accessToken", accessToken);

Modified: ofbiz/trunk/specialpurpose/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java (original)
+++ ofbiz/trunk/specialpurpose/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java Sat Nov  5 11:27:46 2016
@@ -105,7 +105,7 @@ public class LinkedInAuthenticator imple
             GenericValue userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), false);
             String externalAuthId = userLogin.getString("externalAuthId");
             GenericValue linkedInUser = delegator.findOne("LinkedInUser", UtilMisc.toMap("linedInUserId", externalAuthId), false);
-            if (UtilValidate.isNotEmpty(linkedInUser)) {
+            if (linkedInUser != null) {
                 String accessToken = linkedInUser.getString("accessToken");
                 if (UtilValidate.isNotEmpty(accessToken)) {
                     getMethod = new HttpGet(LinkedInEvents.TokenEndpoint + LinkedInEvents.UserApiUri  + "?oauth2_access_token=" + accessToken);
@@ -217,7 +217,7 @@ public class LinkedInAuthenticator imple
             GenericValue userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), false);
             String externalAuthId = userLogin.getString("externalAuthId");
             GenericValue linkedInUser = delegator.findOne("LinkedInUser", UtilMisc.toMap("linkedInUserId", externalAuthId), false);
-            if (UtilValidate.isNotEmpty(linkedInUser)) {
+            if (linkedInUser != null) {
                 String accessToken = linkedInUser.getString("accessToken");
                 if (UtilValidate.isNotEmpty(accessToken)) {
                     getMethod = new HttpGet(LinkedInEvents.TokenEndpoint + LinkedInEvents.UserApiUri + "?oauth2_access_token=" + accessToken);

Modified: ofbiz/trunk/specialpurpose/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java (original)
+++ ofbiz/trunk/specialpurpose/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java Sat Nov  5 11:27:46 2016
@@ -73,7 +73,7 @@ public class ScrumServices {
                             String productId = subject.substring(pdLocation + 3, nonDigitLocation);
                             // Debug.logInfo("=======================Product id found in subject: >>" + custRequestId + "<<", module);
                             GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne();
-                            if (UtilValidate.isNotEmpty(product)) {
+                            if (product != null) {
                                 GenericValue communicationEventProductMap = EntityQuery.use(delegator).from("CommunicationEventProduct").where("productId", productId, "communicationEventId", communicationEventId).queryOne();
                                 if (UtilValidate.isEmpty(communicationEventProductMap)) {
                                     GenericValue communicationEventProduct = delegator.makeValue("CommunicationEventProduct", UtilMisc.toMap("productId", productId, "communicationEventId", communicationEventId));

Modified: ofbiz/trunk/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java?rev=1768192&r1=1768191&r2=1768192&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java Sat Nov  5 11:27:46 2016
@@ -62,7 +62,7 @@ public class WebPosEvents {
         String responseString = LoginEvents.storeLogin(request, response);
         GenericValue userLoginNew = (GenericValue)session.getAttribute("userLogin");
         
-        if (UtilValidate.isNotEmpty(userLoginNew) && UtilValidate.isNotEmpty(posTerminalId)) {
+        if (userLoginNew != null && UtilValidate.isNotEmpty(posTerminalId)) {
             webPosSession.setUserLogin(userLoginNew);
         }
         return responseString;
@@ -93,14 +93,14 @@ public class WebPosEvents {
             String facilityId = null;
             String currencyUomId = request.getParameter("currencyUomId");
 
-            if (UtilValidate.isNotEmpty(productStore)) {
+            if (productStore != null) {
                 facilityId = productStore.getString("inventoryFacilityId");
                 if (UtilValidate.isEmpty(currencyUomId)) {
                     currencyUomId = productStore.getString("defaultCurrencyUomId");
                 }
             }
             
-            if (UtilValidate.isNotEmpty(userLogin)) {
+            if (userLogin != null) {
                 session.setAttribute("userLogin", userLogin);
             }
 
@@ -162,7 +162,7 @@ public class WebPosEvents {
             try {
                 String productId = request.getParameter("productId");
                 product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne();
-                if (UtilValidate.isNotEmpty(product)) {
+                if (product != null) {
                     request.setAttribute("product", product);
                     if (UtilValidate.isNotEmpty(product.getString("isVirtual")) && "Y".equalsIgnoreCase(product.getString("isVirtual"))) {
                         String virtualVariantMethodEnum = product.getString("virtualVariantMethodEnum");
@@ -188,7 +188,7 @@ public class WebPosEvents {
                                             for (int i=0; i < featureOrder.size(); i++) {
                                                 String featureKey = featureOrder.get(i);
                                                 GenericValue featureValue = EntityQuery.use(delegator).from("ProductFeatureType").where("productFeatureTypeId", featureOrder.get(i)).cache().queryOne();
-                                                if (UtilValidate.isNotEmpty(featureValue) &&
+                                                if (featureValue != null &&
                                                     UtilValidate.isNotEmpty(featureValue.get("description"))) {
                                                     featureTypes.put(featureKey, featureValue.get("description"));
                                                 } else {