details: /erp/devel/main/rev/b92fae6e192e
changeset: 8234:b92fae6e192e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Aug 18 13:16:28 2010 +0200
summary: fixed bug 14232: ActivationKey.setLogger adds log-prefix several
times
details: /erp/devel/main/rev/d9c31d4e321d
changeset: 8235:d9c31d4e321d
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Aug 18 18:12:07 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/78498fa57902
changeset: 8236:78498fa57902
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Aug 18 18:12:08 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/obps/ActivationKey.java | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diffs (38 lines):
diff -r 9f57c013c4ac -r 78498fa57902 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 18 10:30:44 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 18 18:12:08 2010 +0200
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17989]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18235]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 9f57c013c4ac -r 78498fa57902
src/org/openbravo/erpCommon/obps/ActivationKey.java
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java Wed Aug 18
10:30:44 2010 +0530
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java Wed Aug 18
18:12:08 2010 +0200
@@ -412,7 +412,12 @@
if (appender.getLayout() instanceof PatternLayout) {
PatternLayout l = (PatternLayout) appender.getLayout();
opsLogId = getOpsLogId();
- l.setConversionPattern(opsLogId + l.getConversionPattern());
+ String conversionPattern = l.getConversionPattern();
+
+ // do not set checksum in case it is already set
+ if (conversionPattern == null ||
!conversionPattern.startsWith(opsLogId)) {
+ l.setConversionPattern(opsLogId + conversionPattern);
+ }
}
}
opsLog = true;
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
