Branch: refs/heads/hotfix/jon3.1.2 Home: https://github.com/rhq-project/rhq Commit: 38ab8524608a3f9c622e609cb369df5d411cabd0 https://github.com/rhq-project/rhq/commit/38ab8524608a3f9c622e609cb369df5... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-06-27 (Fri, 27 Jun 2014) Changed paths: M modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java M modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java M modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java M modules/core/domain/src/main/java/org/rhq/core/domain/event/Event.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java Log Message: ----------- [1110277] RHQ_EVENT table's detail field limit of 4000 character will break when a log message contains multibyte characters (UTF-8) This is a problem in a few places, not just events. We're not properly protecting against the 4000 byte limit on oracle, just the 4000 character limit declared on the varchar2 field. - Add DatabaseType.getString() which can truncate as needed in a vendor-specific way. - Use the new getString() to store safe versions of event detail, alert notification log message, and calltime dataset destination. Conflicts: modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java Cherry-Pick master 1d836a790f8e8d2da79a31e8c796324e85ae7851 (cherry picked from relese/jon3.2.x commit 6a5f14b4089dfe2e17cbc926b22685baec2de206) Conflicts: modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java (cherry picked from release/jon3.1.x commit 2d78c7359617bc2c680ab6d5e5266e0ab953656f)