Author: jleroux
Date: Sat Jun 2 19:13:25 2012
New Revision: 1345559
URL:
http://svn.apache.org/viewvc?rev=1345559&view=revLog:
Better format after r1345547
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java?rev=1345559&r1=1345558&r2=1345559&view=diff==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java Sat Jun 2 19:13:25 2012
@@ -234,19 +234,18 @@ public class PromoServices {
}
public static Map<String, Object> importPromoCodeEmailsFromFile(DispatchContext dctx, Map<String, ? extends Object> context) {
- LocalDispatcher dispatcher = dctx.getDispatcher();
+ LocalDispatcher dispatcher = dctx.getDispatcher();
String productPromoCodeId = (String) context.get("productPromoCodeId");
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = (Locale) context.get("locale");
-
+
ByteBuffer bytebufferwrapper = (ByteBuffer) context.get("uploadedFile");
-
+
if (bytebufferwrapper == null) {
- return ServiceUtil.returnError(UtilProperties.getMessage(resource,
- "ProductPromoCodeImportUploadedFileNotValid", locale));
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ProductPromoCodeImportUploadedFileNotValid", locale));
}
- byte[] wrapper = bytebufferwrapper.array();
+ byte[] wrapper = bytebufferwrapper.array();
// read the bytes into a reader
BufferedReader reader = new BufferedReader(new StringReader(new String(wrapper)));