You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2006/11/09 22:11:55 UTC
svn commit: r473074 - in /incubator/ofbiz/trunk:
applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/
applications/product/src/org/ofbiz/shipment/shipment/
framework/base/src/base/org/ofbiz/base/crypto/
framework/base/src/base/org/ofbiz/b...
Author: jleroux
Date: Thu Nov 9 13:11:53 2006
New Revision: 473074
URL: http://svn.apache.org/viewvc?view=rev&rev=473074
Log:
A patch from Jean-Sébastien Hederer "Variable allocation without effect" (https://issues.apache.org/jira/browse/OFBIZ-439)
Thanks Jean-Sébastien
Modified:
incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
incubator/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/crypto/BlowFishCrypt.java
incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilHttp.java
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java
Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?view=diff&rev=473074&r1=473073&r2=473074
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Thu Nov 9 13:11:53 2006
@@ -1363,7 +1363,7 @@
serviceContext = new HashMap();
serviceContext.put("inventoryItemId", inventoryItemId);
serviceContext.put("userLogin", userLogin);
- resultService = resultService = dispatcher.runSync("balanceInventoryItems", serviceContext);
+ resultService = dispatcher.runSync("balanceInventoryItems", serviceContext);
}
} catch(Exception exc) {
return ServiceUtil.returnError(exc.getMessage());
@@ -1401,7 +1401,7 @@
serviceContext.put("priorityOrderId", orderItem.getString("orderId"));
serviceContext.put("priorityOrderItemSeqId", orderItem.getString("orderItemSeqId"));
}
- resultService = resultService = dispatcher.runSync("balanceInventoryItems", serviceContext);
+ resultService = dispatcher.runSync("balanceInventoryItems", serviceContext);
} catch(Exception exc) {
return ServiceUtil.returnError(exc.getMessage());
}
@@ -1714,7 +1714,7 @@
serviceContext.put("quantityProduced", new Double(totalQuantityProduced));
serviceContext.put("quantityRejected", new Double(totalQuantityRejected));
serviceContext.put("userLogin", userLogin);
- Map resultService = resultService = dispatcher.runSync("updateWorkEffort", serviceContext);
+ Map resultService = dispatcher.runSync("updateWorkEffort", serviceContext);
} catch(Exception exc) {
return ServiceUtil.returnError(exc.getMessage());
}
Modified: incubator/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?view=diff&rev=473074&r1=473073&r2=473074
==============================================================================
--- incubator/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ incubator/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Thu Nov 9 13:11:53 2006
@@ -852,7 +852,7 @@
// get the carrierPartyId
try {
- GenericValue shipmentRouteSegment = shipmentRouteSegment = delegator.findByPrimaryKeyCache("ShipmentRouteSegment",
+ GenericValue shipmentRouteSegment = delegator.findByPrimaryKeyCache("ShipmentRouteSegment",
UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId));
carrierPartyId = shipmentRouteSegment.getString("carrierPartyId");
} catch (GenericEntityException e) {
Modified: incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/crypto/BlowFishCrypt.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/crypto/BlowFishCrypt.java?view=diff&rev=473074&r1=473073&r2=473074
==============================================================================
--- incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/crypto/BlowFishCrypt.java (original)
+++ incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/crypto/BlowFishCrypt.java Thu Nov 9 13:11:53 2006
@@ -127,7 +127,7 @@
}
public static byte[] generateKey() throws NoSuchAlgorithmException {
- KeyGenerator keyGen = keyGen = KeyGenerator.getInstance("Blowfish");
+ KeyGenerator keyGen = KeyGenerator.getInstance("Blowfish");
keyGen.init(448);
SecretKey secretKey = keyGen.generateKey();
Modified: incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilHttp.java?view=diff&rev=473074&r1=473073&r2=473074
==============================================================================
--- incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilHttp.java (original)
+++ incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilHttp.java Thu Nov 9 13:11:53 2006
@@ -317,7 +317,7 @@
public static Locale getLocale(HttpServletRequest request, HttpSession session, Object appDefaultLocale) {
// check session first, should override all if anything set there
- Object localeObject = localeObject = session != null ? session.getAttribute("locale") : null;
+ Object localeObject = session != null ? session.getAttribute("locale") : null;
// next see if the userLogin has a value
if (localeObject == null) {
Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?view=diff&rev=473074&r1=473073&r2=473074
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original)
+++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Thu Nov 9 13:11:53 2006
@@ -273,7 +273,7 @@
FastMap thisURI = (FastMap) debugMap.get(o);
- StringBuffer verboseMessageBuffer = verboseMessageBuffer = new StringBuffer();
+ StringBuffer verboseMessageBuffer = new StringBuffer();
Iterator debugIter = ((Set) thisURI.keySet()).iterator();
while (debugIter.hasNext()) {
@@ -382,7 +382,7 @@
String request = (String) o;
FastMap thisURI = (FastMap) debugMap.get(o);
- StringBuffer verboseMessageBuffer = verboseMessageBuffer = new StringBuffer();
+ StringBuffer verboseMessageBuffer = new StringBuffer();
Iterator debugIter = ((Set) thisURI.keySet()).iterator();
while (debugIter.hasNext()) {