Modified:
/getpaid.SalesforcePloneFormGenAdapter/trunk/getpaid/SalesforcePloneFormGenAdapter/CHANGES.txt
/getpaid.SalesforcePloneFormGenAdapter/trunk/getpaid/SalesforcePloneFormGenAdapter/content/getpaidpfgsalesforceadapter.py
=======================================
---
/getpaid.SalesforcePloneFormGenAdapter/trunk/getpaid/SalesforcePloneFormGenAdapter/CHANGES.txt
Sun Aug 2 11:07:58 2009
+++
/getpaid.SalesforcePloneFormGenAdapter/trunk/getpaid/SalesforcePloneFormGenAdapter/CHANGES.txt
Mon Aug 3 12:21:23 2009
@@ -4,6 +4,7 @@
1.4 (unreleased)
----------------
+ - Improve exception handling
1.3 (2009-08-02)
----------------
=======================================
---
/getpaid.SalesforcePloneFormGenAdapter/trunk/getpaid/SalesforcePloneFormGenAdapter/content/getpaidpfgsalesforceadapter.py
Sun Aug 2 11:03:22 2009
+++
/getpaid.SalesforcePloneFormGenAdapter/trunk/getpaid/SalesforcePloneFormGenAdapter/content/getpaidpfgsalesforceadapter.py
Mon Aug 3 12:21:23 2009
@@ -647,11 +647,17 @@
try:
executeAdapter(order, data, salesforce)
+ except ConflictError:
+ raise
except Exception, e:
- # I catch everything since any uncaught exception here
+ # I catch everything since any uncaught exception here
# will prevent the order from moving to charged
logger.error("Exception saving order %s to
salesforce: %s" % (order.order_id, e))
logger.info('Data: %s' % data)
+ except:
+ logger.error("Unknown Exception saving order %s to
salesforce" % (order.order_id))
+ logger.info('Data: %s' % data)
+
def executeAdapter(order, data, salesforce):
sfObject = data['SFObjectForCustomer']